diff --git a/assets/Texture/AlineLough_Aline.png b/assets/Texture/AlineLough_Aline.png index be331b9..20411a9 100644 Binary files a/assets/Texture/AlineLough_Aline.png and b/assets/Texture/AlineLough_Aline.png differ diff --git a/assets/Texture/AlineLough_Aline.png.meta b/assets/Texture/AlineLough_Aline.png.meta index e442aa3..dd07937 100644 --- a/assets/Texture/AlineLough_Aline.png.meta +++ b/assets/Texture/AlineLough_Aline.png.meta @@ -46,9 +46,9 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 319, + "width": 220, "height": 423, - "rawWidth": 319, + "rawWidth": 220, "rawHeight": 423, "borderTop": 0, "borderBottom": 0, @@ -61,16 +61,16 @@ "meshType": 0, "vertices": { "rawPosition": [ - -159.5, + -110, -211.5, 0, - 159.5, + 110, -211.5, 0, - -159.5, + -110, 211.5, 0, - 159.5, + 110, 211.5, 0 ], @@ -85,11 +85,11 @@ "uv": [ 0, 423, - 319, + 220, 423, 0, 0, - 319, + 220, 0 ], "nuv": [ @@ -103,12 +103,12 @@ 1 ], "minPos": [ - -159.5, + -110, -211.5, 0 ], "maxPos": [ - 159.5, + 110, 211.5, 0 ] diff --git a/assets/Texture/BTN_AddTime.png b/assets/Texture/BTN_AddTime.png index 95342d4..d840b30 100644 Binary files a/assets/Texture/BTN_AddTime.png and b/assets/Texture/BTN_AddTime.png differ diff --git a/assets/Texture/BTN_AddTime.png.meta b/assets/Texture/BTN_AddTime.png.meta index 1eb3968..2a7258c 100644 --- a/assets/Texture/BTN_AddTime.png.meta +++ b/assets/Texture/BTN_AddTime.png.meta @@ -47,9 +47,9 @@ "trimX": 0, "trimY": 0, "width": 377, - "height": 131, + "height": 86, "rawWidth": 377, - "rawHeight": 131, + "rawHeight": 86, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -62,16 +62,16 @@ "vertices": { "rawPosition": [ -188.5, - -65.5, + -43, 0, 188.5, - -65.5, + -43, 0, -188.5, - 65.5, + 43, 0, 188.5, - 65.5, + 43, 0 ], "indexes": [ @@ -84,9 +84,9 @@ ], "uv": [ 0, - 131, + 86, 377, - 131, + 86, 0, 0, 377, @@ -104,12 +104,12 @@ ], "minPos": [ -188.5, - -65.5, + -43, 0 ], "maxPos": [ 188.5, - 65.5, + 43, 0 ] }, diff --git a/assets/Texture/BTN_ClosePanel.png b/assets/Texture/BTN_ClosePanel.png index b722383..44db9b1 100644 Binary files a/assets/Texture/BTN_ClosePanel.png and b/assets/Texture/BTN_ClosePanel.png differ diff --git a/assets/Texture/BTN_ClosePanel.png.meta b/assets/Texture/BTN_ClosePanel.png.meta index 305602c..0afe25b 100644 --- a/assets/Texture/BTN_ClosePanel.png.meta +++ b/assets/Texture/BTN_ClosePanel.png.meta @@ -46,9 +46,9 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 108, + "width": 107, "height": 108, - "rawWidth": 108, + "rawWidth": 107, "rawHeight": 108, "borderTop": 0, "borderBottom": 0, @@ -61,16 +61,16 @@ "meshType": 0, "vertices": { "rawPosition": [ - -54, + -53.5, -54, 0, - 54, + 53.5, -54, 0, - -54, + -53.5, 54, 0, - 54, + 53.5, 54, 0 ], @@ -85,11 +85,11 @@ "uv": [ 0, 108, - 108, + 107, 108, 0, 0, - 108, + 107, 0 ], "nuv": [ @@ -103,12 +103,12 @@ 1 ], "minPos": [ - -54, + -53.5, -54, 0 ], "maxPos": [ - 54, + 53.5, 54, 0 ] diff --git a/assets/Texture/BTN_Continue.png b/assets/Texture/BTN_Continue.png index 079d669..905095c 100644 Binary files a/assets/Texture/BTN_Continue.png and b/assets/Texture/BTN_Continue.png differ diff --git a/assets/Texture/BTN_Continue.png.meta b/assets/Texture/BTN_Continue.png.meta index 0275fd4..f60e864 100644 --- a/assets/Texture/BTN_Continue.png.meta +++ b/assets/Texture/BTN_Continue.png.meta @@ -47,9 +47,9 @@ "trimX": 0, "trimY": 0, "width": 216, - "height": 98, + "height": 64, "rawWidth": 216, - "rawHeight": 98, + "rawHeight": 64, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -62,16 +62,16 @@ "vertices": { "rawPosition": [ -108, - -49, + -32, 0, 108, - -49, + -32, 0, -108, - 49, + 32, 0, 108, - 49, + 32, 0 ], "indexes": [ @@ -84,9 +84,9 @@ ], "uv": [ 0, - 98, + 64, 216, - 98, + 64, 0, 0, 216, @@ -104,12 +104,12 @@ ], "minPos": [ -108, - -49, + -32, 0 ], "maxPos": [ 108, - 49, + 32, 0 ] }, diff --git a/assets/Texture/BTN_ContinueMoney.png b/assets/Texture/BTN_ContinueMoney.png index f3c59f4..4f6ea01 100644 Binary files a/assets/Texture/BTN_ContinueMoney.png and b/assets/Texture/BTN_ContinueMoney.png differ diff --git a/assets/Texture/BTN_ContinueMoney.png.meta b/assets/Texture/BTN_ContinueMoney.png.meta index d959646..6f969ca 100644 --- a/assets/Texture/BTN_ContinueMoney.png.meta +++ b/assets/Texture/BTN_ContinueMoney.png.meta @@ -47,9 +47,9 @@ "trimX": 0, "trimY": 0, "width": 207, - "height": 93, + "height": 67, "rawWidth": 207, - "rawHeight": 93, + "rawHeight": 67, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -62,16 +62,16 @@ "vertices": { "rawPosition": [ -103.5, - -46.5, + -33.5, 0, 103.5, - -46.5, + -33.5, 0, -103.5, - 46.5, + 33.5, 0, 103.5, - 46.5, + 33.5, 0 ], "indexes": [ @@ -84,9 +84,9 @@ ], "uv": [ 0, - 93, + 67, 207, - 93, + 67, 0, 0, 207, @@ -104,12 +104,12 @@ ], "minPos": [ -103.5, - -46.5, + -33.5, 0 ], "maxPos": [ 103.5, - 46.5, + 33.5, 0 ] }, diff --git a/assets/Texture/BTN_DoubleReward.png b/assets/Texture/BTN_DoubleReward.png index 4be806e..4a14320 100644 Binary files a/assets/Texture/BTN_DoubleReward.png and b/assets/Texture/BTN_DoubleReward.png differ diff --git a/assets/Texture/BTN_DoubleReward.png.meta b/assets/Texture/BTN_DoubleReward.png.meta index eb7311a..fce06c3 100644 --- a/assets/Texture/BTN_DoubleReward.png.meta +++ b/assets/Texture/BTN_DoubleReward.png.meta @@ -47,9 +47,9 @@ "trimX": 0, "trimY": 0, "width": 298, - "height": 155, + "height": 98, "rawWidth": 298, - "rawHeight": 155, + "rawHeight": 98, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -62,16 +62,16 @@ "vertices": { "rawPosition": [ -149, - -77.5, + -49, 0, 149, - -77.5, + -49, 0, -149, - 77.5, + 49, 0, 149, - 77.5, + 49, 0 ], "indexes": [ @@ -84,9 +84,9 @@ ], "uv": [ 0, - 155, + 98, 298, - 155, + 98, 0, 0, 298, @@ -104,12 +104,12 @@ ], "minPos": [ -149, - -77.5, + -49, 0 ], "maxPos": [ 149, - 77.5, + 49, 0 ] }, diff --git a/assets/Texture/BTN_EnterReward.png b/assets/Texture/BTN_EnterReward.png index fa6e22e..6944b94 100644 Binary files a/assets/Texture/BTN_EnterReward.png and b/assets/Texture/BTN_EnterReward.png differ diff --git a/assets/Texture/BTN_EnterReward.png.meta b/assets/Texture/BTN_EnterReward.png.meta index 330f2ff..5655ea3 100644 --- a/assets/Texture/BTN_EnterReward.png.meta +++ b/assets/Texture/BTN_EnterReward.png.meta @@ -42,14 +42,14 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": -1, - "offsetY": -0.5, - "trimX": 0, - "trimY": 3, - "width": 369, - "height": 386, + "offsetX": -1.5, + "offsetY": 0, + "trimX": 8, + "trimY": 8, + "width": 352, + "height": 298, "rawWidth": 371, - "rawHeight": 391, + "rawHeight": 314, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -184.5, - -193, + -176, + -149, 0, - 184.5, - -193, + 176, + -149, 0, - -184.5, - 193, + -176, + 149, 0, - 184.5, - 193, + 176, + 149, 0 ], "indexes": [ @@ -83,33 +83,33 @@ 3 ], "uv": [ - 0, - 388, - 369, - 388, - 0, - 2, - 369, - 2 + 8, + 306, + 360, + 306, + 8, + 8, + 360, + 8 ], "nuv": [ - 0, - 0.005115089514066497, - 0.9946091644204852, - 0.005115089514066497, - 0, - 0.9923273657289002, - 0.9946091644204852, - 0.9923273657289002 + 0.0215633423180593, + 0.025477707006369428, + 0.9703504043126685, + 0.025477707006369428, + 0.0215633423180593, + 0.9745222929936306, + 0.9703504043126685, + 0.9745222929936306 ], "minPos": [ - -184.5, - -193, + -176, + -149, 0 ], "maxPos": [ - 184.5, - 193, + 176, + 149, 0 ] }, diff --git a/assets/Texture/BTN_Equip.png b/assets/Texture/BTN_Equip.png index 8631e23..b9e6ec9 100644 Binary files a/assets/Texture/BTN_Equip.png and b/assets/Texture/BTN_Equip.png differ diff --git a/assets/Texture/BTN_Equip.png.meta b/assets/Texture/BTN_Equip.png.meta index 0719134..801466c 100644 --- a/assets/Texture/BTN_Equip.png.meta +++ b/assets/Texture/BTN_Equip.png.meta @@ -44,12 +44,12 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 182, - "height": 82, + "trimX": 2, + "trimY": 1, + "width": 178, + "height": 54, "rawWidth": 182, - "rawHeight": 82, + "rawHeight": 56, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -91, - -41, + -89, + -27, 0, - 91, - -41, + 89, + -27, 0, - -91, - 41, + -89, + 27, 0, - 91, - 41, + 89, + 27, 0 ], "indexes": [ @@ -83,33 +83,33 @@ 3 ], "uv": [ - 0, - 82, - 182, - 82, - 0, - 0, - 182, - 0 - ], - "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, + 2, + 55, + 180, + 55, + 2, 1, + 180, 1 ], + "nuv": [ + 0.01098901098901099, + 0.017857142857142856, + 0.989010989010989, + 0.017857142857142856, + 0.01098901098901099, + 0.9821428571428571, + 0.989010989010989, + 0.9821428571428571 + ], "minPos": [ - -91, - -41, + -89, + -27, 0 ], "maxPos": [ - 91, - 41, + 89, + 27, 0 ] }, diff --git a/assets/Texture/BTN_Fire.png b/assets/Texture/BTN_Fire.png index 3cdbbc7..ae2c775 100644 Binary files a/assets/Texture/BTN_Fire.png and b/assets/Texture/BTN_Fire.png differ diff --git a/assets/Texture/BTN_Fire.png.meta b/assets/Texture/BTN_Fire.png.meta index c0e0622..5b588c5 100644 --- a/assets/Texture/BTN_Fire.png.meta +++ b/assets/Texture/BTN_Fire.png.meta @@ -46,9 +46,9 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 275, + "width": 267, "height": 277, - "rawWidth": 275, + "rawWidth": 267, "rawHeight": 277, "borderTop": 0, "borderBottom": 0, @@ -61,16 +61,16 @@ "meshType": 0, "vertices": { "rawPosition": [ - -137.5, + -133.5, -138.5, 0, - 137.5, + 133.5, -138.5, 0, - -137.5, + -133.5, 138.5, 0, - 137.5, + 133.5, 138.5, 0 ], @@ -85,11 +85,11 @@ "uv": [ 0, 277, - 275, + 267, 277, 0, 0, - 275, + 267, 0 ], "nuv": [ @@ -103,12 +103,12 @@ 1 ], "minPos": [ - -137.5, + -133.5, -138.5, 0 ], "maxPos": [ - 137.5, + 133.5, 138.5, 0 ] diff --git a/assets/Texture/BTN_Messege.png b/assets/Texture/BTN_Messege.png index 639956d..7b3d89a 100644 Binary files a/assets/Texture/BTN_Messege.png and b/assets/Texture/BTN_Messege.png differ diff --git a/assets/Texture/BTN_Messege.png.meta b/assets/Texture/BTN_Messege.png.meta index 44dcf5c..cf06c0c 100644 --- a/assets/Texture/BTN_Messege.png.meta +++ b/assets/Texture/BTN_Messege.png.meta @@ -42,14 +42,14 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": -0.5, - "offsetY": 0.5, - "trimX": 2, - "trimY": 1, - "width": 215, - "height": 292, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 220, + "height": 264, "rawWidth": 220, - "rawHeight": 295, + "rawHeight": 264, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -107.5, - -146, + -110, + -132, 0, - 107.5, - -146, + 110, + -132, 0, - -107.5, - 146, + -110, + 132, 0, - 107.5, - 146, + 110, + 132, 0 ], "indexes": [ @@ -83,33 +83,33 @@ 3 ], "uv": [ - 2, - 294, - 217, - 294, - 2, - 2, - 217, - 2 + 0, + 264, + 220, + 264, + 0, + 0, + 220, + 0 ], "nuv": [ - 0.00909090909090909, - 0.006779661016949152, - 0.9863636363636363, - 0.006779661016949152, - 0.00909090909090909, - 0.9966101694915255, - 0.9863636363636363, - 0.9966101694915255 + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 ], "minPos": [ - -107.5, - -146, + -110, + -132, 0 ], "maxPos": [ - 107.5, - 146, + 110, + 132, 0 ] }, diff --git a/assets/Texture/BTN_Messege_Check.png b/assets/Texture/BTN_Messege_Check.png index c785438..0763152 100644 Binary files a/assets/Texture/BTN_Messege_Check.png and b/assets/Texture/BTN_Messege_Check.png differ diff --git a/assets/Texture/BTN_Messege_Check.png.meta b/assets/Texture/BTN_Messege_Check.png.meta index 4ca160f..f61c510 100644 --- a/assets/Texture/BTN_Messege_Check.png.meta +++ b/assets/Texture/BTN_Messege_Check.png.meta @@ -47,9 +47,9 @@ "trimX": 0, "trimY": 0, "width": 218, - "height": 287, + "height": 236, "rawWidth": 218, - "rawHeight": 287, + "rawHeight": 236, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -62,16 +62,16 @@ "vertices": { "rawPosition": [ -109, - -143.5, + -118, 0, 109, - -143.5, + -118, 0, -109, - 143.5, + 118, 0, 109, - 143.5, + 118, 0 ], "indexes": [ @@ -84,9 +84,9 @@ ], "uv": [ 0, - 287, + 236, 218, - 287, + 236, 0, 0, 218, @@ -104,12 +104,12 @@ ], "minPos": [ -109, - -143.5, + -118, 0 ], "maxPos": [ 109, - 143.5, + 118, 0 ] }, diff --git a/assets/Texture/BTN_MiaoZhun.png b/assets/Texture/BTN_MiaoZhun.png index 280fe3f..379accb 100644 Binary files a/assets/Texture/BTN_MiaoZhun.png and b/assets/Texture/BTN_MiaoZhun.png differ diff --git a/assets/Texture/BTN_MiaoZhun.png.meta b/assets/Texture/BTN_MiaoZhun.png.meta index ebb241e..7d42282 100644 --- a/assets/Texture/BTN_MiaoZhun.png.meta +++ b/assets/Texture/BTN_MiaoZhun.png.meta @@ -43,12 +43,12 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 275, - "height": 277, - "rawWidth": 275, + "offsetY": -1, + "trimX": 7, + "trimY": 8, + "width": 254, + "height": 263, + "rawWidth": 268, "rawHeight": 277, "borderTop": 0, "borderBottom": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -137.5, - -138.5, + -127, + -131.5, 0, - 137.5, - -138.5, + 127, + -131.5, 0, - -137.5, - 138.5, + -127, + 131.5, 0, - 137.5, - 138.5, + 127, + 131.5, 0 ], "indexes": [ @@ -83,33 +83,33 @@ 3 ], "uv": [ - 0, - 277, - 275, - 277, - 0, - 0, - 275, - 0 + 7, + 269, + 261, + 269, + 7, + 6, + 261, + 6 ], "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 + 0.026119402985074626, + 0.021660649819494584, + 0.9738805970149254, + 0.021660649819494584, + 0.026119402985074626, + 0.9711191335740073, + 0.9738805970149254, + 0.9711191335740073 ], "minPos": [ - -137.5, - -138.5, + -127, + -131.5, 0 ], "maxPos": [ - 137.5, - 138.5, + 127, + 131.5, 0 ] }, diff --git a/assets/Texture/BTN_Ok.png b/assets/Texture/BTN_Ok.png index 95a588a..1eccd08 100644 Binary files a/assets/Texture/BTN_Ok.png and b/assets/Texture/BTN_Ok.png differ diff --git a/assets/Texture/BTN_Ok.png.meta b/assets/Texture/BTN_Ok.png.meta index a24bba4..8a22d35 100644 --- a/assets/Texture/BTN_Ok.png.meta +++ b/assets/Texture/BTN_Ok.png.meta @@ -47,9 +47,9 @@ "trimX": 0, "trimY": 0, "width": 389, - "height": 153, + "height": 136, "rawWidth": 389, - "rawHeight": 153, + "rawHeight": 136, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -62,16 +62,16 @@ "vertices": { "rawPosition": [ -194.5, - -76.5, + -68, 0, 194.5, - -76.5, + -68, 0, -194.5, - 76.5, + 68, 0, 194.5, - 76.5, + 68, 0 ], "indexes": [ @@ -84,9 +84,9 @@ ], "uv": [ 0, - 153, + 136, 389, - 153, + 136, 0, 0, 389, @@ -104,12 +104,12 @@ ], "minPos": [ -194.5, - -76.5, + -68, 0 ], "maxPos": [ 194.5, - 76.5, + 68, 0 ] }, diff --git a/assets/Texture/BTN_Replay.png b/assets/Texture/BTN_Replay.png index ea2c011..cbbd887 100644 Binary files a/assets/Texture/BTN_Replay.png and b/assets/Texture/BTN_Replay.png differ diff --git a/assets/Texture/BTN_Replay.png.meta b/assets/Texture/BTN_Replay.png.meta index 49f6e0b..48eb004 100644 --- a/assets/Texture/BTN_Replay.png.meta +++ b/assets/Texture/BTN_Replay.png.meta @@ -47,9 +47,9 @@ "trimX": 0, "trimY": 0, "width": 377, - "height": 131, + "height": 94, "rawWidth": 377, - "rawHeight": 131, + "rawHeight": 94, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -62,16 +62,16 @@ "vertices": { "rawPosition": [ -188.5, - -65.5, + -47, 0, 188.5, - -65.5, + -47, 0, -188.5, - 65.5, + 47, 0, 188.5, - 65.5, + 47, 0 ], "indexes": [ @@ -84,9 +84,9 @@ ], "uv": [ 0, - 131, + 94, 377, - 131, + 94, 0, 0, 377, @@ -104,12 +104,12 @@ ], "minPos": [ -188.5, - -65.5, + -47, 0 ], "maxPos": [ 188.5, - 65.5, + 47, 0 ] }, diff --git a/assets/Texture/BTN_Restart.png b/assets/Texture/BTN_Restart.png index 8c0e8f0..fbae97c 100644 Binary files a/assets/Texture/BTN_Restart.png and b/assets/Texture/BTN_Restart.png differ diff --git a/assets/Texture/BTN_Restart.png.meta b/assets/Texture/BTN_Restart.png.meta index f1aa430..0be17f6 100644 --- a/assets/Texture/BTN_Restart.png.meta +++ b/assets/Texture/BTN_Restart.png.meta @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 158, - "height": 133, - "rawWidth": 158, - "rawHeight": 133, + "width": 235, + "height": 248, + "rawWidth": 235, + "rawHeight": 248, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -79, - -66.5, + -117.5, + -124, 0, - 79, - -66.5, + 117.5, + -124, 0, - -79, - 66.5, + -117.5, + 124, 0, - 79, - 66.5, + 117.5, + 124, 0 ], "indexes": [ @@ -84,12 +84,12 @@ ], "uv": [ 0, - 133, - 158, - 133, + 248, + 235, + 248, 0, 0, - 158, + 235, 0 ], "nuv": [ @@ -103,13 +103,13 @@ 1 ], "minPos": [ - -79, - -66.5, + -117.5, + -124, 0 ], "maxPos": [ - 79, - 66.5, + 117.5, + 124, 0 ] }, diff --git a/assets/Texture/BTN_Scan.png b/assets/Texture/BTN_Scan.png index 2c901f2..dafad9a 100644 Binary files a/assets/Texture/BTN_Scan.png and b/assets/Texture/BTN_Scan.png differ diff --git a/assets/Texture/BTN_Scan.png.meta b/assets/Texture/BTN_Scan.png.meta index 6142519..e80bc39 100644 --- a/assets/Texture/BTN_Scan.png.meta +++ b/assets/Texture/BTN_Scan.png.meta @@ -43,13 +43,13 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": -0.5, - "trimX": 2, - "trimY": 2, - "width": 203, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 207, "height": 252, "rawWidth": 207, - "rawHeight": 255, + "rawHeight": 252, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,16 +61,16 @@ "meshType": 0, "vertices": { "rawPosition": [ - -101.5, + -103.5, -126, 0, - 101.5, + 103.5, -126, 0, - -101.5, + -103.5, 126, 0, - 101.5, + 103.5, 126, 0 ], @@ -83,32 +83,32 @@ 3 ], "uv": [ - 2, - 253, - 205, - 253, - 2, - 1, - 205, - 1 + 0, + 252, + 207, + 252, + 0, + 0, + 207, + 0 ], "nuv": [ - 0.00966183574879227, - 0.00392156862745098, - 0.9903381642512077, - 0.00392156862745098, - 0.00966183574879227, - 0.9921568627450981, - 0.9903381642512077, - 0.9921568627450981 + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 ], "minPos": [ - -101.5, + -103.5, -126, 0 ], "maxPos": [ - 101.5, + 103.5, 126, 0 ] diff --git a/assets/Texture/BTN_Setting.png b/assets/Texture/BTN_Setting.png index 293bbfc..45b7819 100644 Binary files a/assets/Texture/BTN_Setting.png and b/assets/Texture/BTN_Setting.png differ diff --git a/assets/Texture/BTN_Setting.png.meta b/assets/Texture/BTN_Setting.png.meta index 6175ceb..3b5638b 100644 --- a/assets/Texture/BTN_Setting.png.meta +++ b/assets/Texture/BTN_Setting.png.meta @@ -46,9 +46,9 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 110, + "width": 109, "height": 110, - "rawWidth": 110, + "rawWidth": 109, "rawHeight": 110, "borderTop": 0, "borderBottom": 0, @@ -61,16 +61,16 @@ "meshType": 0, "vertices": { "rawPosition": [ - -55, + -54.5, -55, 0, - 55, + 54.5, -55, 0, - -55, + -54.5, 55, 0, - 55, + 54.5, 55, 0 ], @@ -85,11 +85,11 @@ "uv": [ 0, 110, - 110, + 109, 110, 0, 0, - 110, + 109, 0 ], "nuv": [ @@ -103,12 +103,12 @@ 1 ], "minPos": [ - -55, + -54.5, -55, 0 ], "maxPos": [ - 55, + 54.5, 55, 0 ] diff --git a/assets/Texture/BTN_StartGame.png b/assets/Texture/BTN_StartGame.png index ccf8e13..e9b09ed 100644 Binary files a/assets/Texture/BTN_StartGame.png and b/assets/Texture/BTN_StartGame.png differ diff --git a/assets/Texture/BTN_StartGame.png.meta b/assets/Texture/BTN_StartGame.png.meta index 7b28109..f743984 100644 --- a/assets/Texture/BTN_StartGame.png.meta +++ b/assets/Texture/BTN_StartGame.png.meta @@ -44,12 +44,12 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 529, - "height": 195, + "trimX": 4, + "trimY": 4, + "width": 521, + "height": 168, "rawWidth": 529, - "rawHeight": 195, + "rawHeight": 176, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -264.5, - -97.5, + -260.5, + -84, 0, - 264.5, - -97.5, + 260.5, + -84, 0, - -264.5, - 97.5, + -260.5, + 84, 0, - 264.5, - 97.5, + 260.5, + 84, 0 ], "indexes": [ @@ -83,33 +83,33 @@ 3 ], "uv": [ - 0, - 195, - 529, - 195, - 0, - 0, - 529, - 0 + 4, + 172, + 525, + 172, + 4, + 4, + 525, + 4 ], "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 + 0.007561436672967864, + 0.022727272727272728, + 0.9924385633270322, + 0.022727272727272728, + 0.007561436672967864, + 0.9772727272727273, + 0.9924385633270322, + 0.9772727272727273 ], "minPos": [ - -264.5, - -97.5, + -260.5, + -84, 0 ], "maxPos": [ - 264.5, - 97.5, + 260.5, + 84, 0 ] }, diff --git a/assets/Texture/BTN_main.png b/assets/Texture/BTN_main.png index 43ef5ec..3de05dd 100644 Binary files a/assets/Texture/BTN_main.png and b/assets/Texture/BTN_main.png differ diff --git a/assets/Texture/BTN_main.png.meta b/assets/Texture/BTN_main.png.meta index 1dd1c80..713a71d 100644 --- a/assets/Texture/BTN_main.png.meta +++ b/assets/Texture/BTN_main.png.meta @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 121, - "height": 131, - "rawWidth": 121, - "rawHeight": 131, + "width": 238, + "height": 249, + "rawWidth": 238, + "rawHeight": 249, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -60.5, - -65.5, + -119, + -124.5, 0, - 60.5, - -65.5, + 119, + -124.5, 0, - -60.5, - 65.5, + -119, + 124.5, 0, - 60.5, - 65.5, + 119, + 124.5, 0 ], "indexes": [ @@ -84,12 +84,12 @@ ], "uv": [ 0, - 131, - 121, - 131, + 249, + 238, + 249, 0, 0, - 121, + 238, 0 ], "nuv": [ @@ -103,13 +103,13 @@ 1 ], "minPos": [ - -60.5, - -65.5, + -119, + -124.5, 0 ], "maxPos": [ - 60.5, - 65.5, + 119, + 124.5, 0 ] }, diff --git a/assets/Texture/Font_GameLose.png b/assets/Texture/Font_GameLose.png index b369aa2..23ecaac 100644 Binary files a/assets/Texture/Font_GameLose.png and b/assets/Texture/Font_GameLose.png differ diff --git a/assets/Texture/Font_GameLose.png.meta b/assets/Texture/Font_GameLose.png.meta index ff305e9..0edcc5d 100644 --- a/assets/Texture/Font_GameLose.png.meta +++ b/assets/Texture/Font_GameLose.png.meta @@ -42,13 +42,13 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 747, - "height": 201, - "rawWidth": 747, + "offsetX": -1.5, + "offsetY": 10.5, + "trimX": 37, + "trimY": 27, + "width": 225, + "height": 126, + "rawWidth": 302, "rawHeight": 201, "borderTop": 0, "borderBottom": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -373.5, - -100.5, + -112.5, + -63, 0, - 373.5, - -100.5, + 112.5, + -63, 0, - -373.5, - 100.5, + -112.5, + 63, 0, - 373.5, - 100.5, + 112.5, + 63, 0 ], "indexes": [ @@ -83,33 +83,33 @@ 3 ], "uv": [ - 0, - 201, - 747, - 201, - 0, - 0, - 747, - 0 + 37, + 174, + 262, + 174, + 37, + 48, + 262, + 48 ], "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 + 0.12251655629139073, + 0.23880597014925373, + 0.8675496688741722, + 0.23880597014925373, + 0.12251655629139073, + 0.8656716417910447, + 0.8675496688741722, + 0.8656716417910447 ], "minPos": [ - -373.5, - -100.5, + -112.5, + -63, 0 ], "maxPos": [ - 373.5, - 100.5, + 112.5, + 63, 0 ] }, diff --git a/assets/Texture/GameWin_Hao.png b/assets/Texture/GameWin_Hao.png index 707a4a8..ff27df1 100644 Binary files a/assets/Texture/GameWin_Hao.png and b/assets/Texture/GameWin_Hao.png differ diff --git a/assets/Texture/GameWin_Hao.png.meta b/assets/Texture/GameWin_Hao.png.meta index eb407fb..cdb224b 100644 --- a/assets/Texture/GameWin_Hao.png.meta +++ b/assets/Texture/GameWin_Hao.png.meta @@ -46,9 +46,9 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 568, + "width": 212, "height": 203, - "rawWidth": 568, + "rawWidth": 212, "rawHeight": 203, "borderTop": 0, "borderBottom": 0, @@ -61,16 +61,16 @@ "meshType": 0, "vertices": { "rawPosition": [ - -284, + -106, -101.5, 0, - 284, + 106, -101.5, 0, - -284, + -106, 101.5, 0, - 284, + 106, 101.5, 0 ], @@ -85,11 +85,11 @@ "uv": [ 0, 203, - 568, + 212, 203, 0, 0, - 568, + 212, 0 ], "nuv": [ @@ -103,12 +103,12 @@ 1 ], "minPos": [ - -284, + -106, -101.5, 0 ], "maxPos": [ - 284, + 106, 101.5, 0 ] diff --git a/assets/Texture/GameWin_Paper.png b/assets/Texture/GameWin_Paper.png index 771ea8a..d766de8 100644 Binary files a/assets/Texture/GameWin_Paper.png and b/assets/Texture/GameWin_Paper.png differ diff --git a/assets/Texture/GameWin_Paper.png.meta b/assets/Texture/GameWin_Paper.png.meta index c660763..b3e7465 100644 --- a/assets/Texture/GameWin_Paper.png.meta +++ b/assets/Texture/GameWin_Paper.png.meta @@ -43,13 +43,13 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": 0.5, - "trimX": 1, + "offsetY": 0, + "trimX": 0, "trimY": 0, - "width": 1013, - "height": 978, + "width": 1015, + "height": 930, "rawWidth": 1015, - "rawHeight": 979, + "rawHeight": 930, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -506.5, - -489, + -507.5, + -465, 0, - 506.5, - -489, + 507.5, + -465, 0, - -506.5, - 489, + -507.5, + 465, 0, - 506.5, - 489, + 507.5, + 465, 0 ], "indexes": [ @@ -83,33 +83,33 @@ 3 ], "uv": [ - 1, - 979, - 1014, - 979, - 1, - 1, - 1014, - 1 + 0, + 930, + 1015, + 930, + 0, + 0, + 1015, + 0 ], "nuv": [ - 0.0009852216748768472, - 0.0010214504596527069, - 0.9990147783251232, - 0.0010214504596527069, - 0.0009852216748768472, + 0, + 0, + 1, + 0, + 0, + 1, 1, - 0.9990147783251232, 1 ], "minPos": [ - -506.5, - -489, + -507.5, + -465, 0 ], "maxPos": [ - 506.5, - 489, + 507.5, + 465, 0 ] }, diff --git a/assets/Texture/Gun_SelectArrow.png b/assets/Texture/Gun_SelectArrow.png index daf6a4d..a289e42 100644 Binary files a/assets/Texture/Gun_SelectArrow.png and b/assets/Texture/Gun_SelectArrow.png differ diff --git a/assets/Texture/Gun_SelectArrow.png.meta b/assets/Texture/Gun_SelectArrow.png.meta index ad70d8d..9ea5c6a 100644 --- a/assets/Texture/Gun_SelectArrow.png.meta +++ b/assets/Texture/Gun_SelectArrow.png.meta @@ -44,12 +44,12 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 68, - "height": 137, + "trimX": 2, + "trimY": 2, + "width": 64, + "height": 91, "rawWidth": 68, - "rawHeight": 137, + "rawHeight": 95, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -34, - -68.5, + -32, + -45.5, 0, - 34, - -68.5, + 32, + -45.5, 0, - -34, - 68.5, + -32, + 45.5, 0, - 34, - 68.5, + 32, + 45.5, 0 ], "indexes": [ @@ -83,33 +83,33 @@ 3 ], "uv": [ - 0, - 137, - 68, - 137, - 0, - 0, - 68, - 0 + 2, + 93, + 66, + 93, + 2, + 2, + 66, + 2 ], "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 + 0.029411764705882353, + 0.021052631578947368, + 0.9705882352941176, + 0.021052631578947368, + 0.029411764705882353, + 0.9789473684210527, + 0.9705882352941176, + 0.9789473684210527 ], "minPos": [ - -34, - -68.5, + -32, + -45.5, 0 ], "maxPos": [ - 34, - 68.5, + 32, + 45.5, 0 ] }, diff --git a/assets/Texture/Gun_SelectBG.png b/assets/Texture/Gun_SelectBG.png index 7867a8c..af3dd25 100644 Binary files a/assets/Texture/Gun_SelectBG.png and b/assets/Texture/Gun_SelectBG.png differ diff --git a/assets/Texture/Gun_SelectBG.png.meta b/assets/Texture/Gun_SelectBG.png.meta index a4d707d..32bcde3 100644 --- a/assets/Texture/Gun_SelectBG.png.meta +++ b/assets/Texture/Gun_SelectBG.png.meta @@ -44,11 +44,11 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 885, - "height": 351, - "rawWidth": 885, + "trimX": 4, + "trimY": 4, + "width": 372, + "height": 343, + "rawWidth": 380, "rawHeight": 351, "borderTop": 0, "borderBottom": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -442.5, - -175.5, + -186, + -171.5, 0, - 442.5, - -175.5, + 186, + -171.5, 0, - -442.5, - 175.5, + -186, + 171.5, 0, - 442.5, - 175.5, + 186, + 171.5, 0 ], "indexes": [ @@ -83,33 +83,33 @@ 3 ], "uv": [ - 0, - 351, - 885, - 351, - 0, - 0, - 885, - 0 + 4, + 347, + 376, + 347, + 4, + 4, + 376, + 4 ], "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 + 0.010526315789473684, + 0.011396011396011397, + 0.9894736842105263, + 0.011396011396011397, + 0.010526315789473684, + 0.9886039886039886, + 0.9894736842105263, + 0.9886039886039886 ], "minPos": [ - -442.5, - -175.5, + -186, + -171.5, 0 ], "maxPos": [ - 442.5, - 175.5, + 186, + 171.5, 0 ] }, diff --git a/assets/Texture/Heart.png b/assets/Texture/Heart.png index 83677a8..b5c0732 100644 Binary files a/assets/Texture/Heart.png and b/assets/Texture/Heart.png differ diff --git a/assets/Texture/Heart.png.meta b/assets/Texture/Heart.png.meta index 9dcdb3d..e908487 100644 --- a/assets/Texture/Heart.png.meta +++ b/assets/Texture/Heart.png.meta @@ -47,9 +47,9 @@ "trimX": 0, "trimY": 0, "width": 125, - "height": 115, + "height": 110, "rawWidth": 125, - "rawHeight": 115, + "rawHeight": 110, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -62,16 +62,16 @@ "vertices": { "rawPosition": [ -62.5, - -57.5, + -55, 0, 62.5, - -57.5, + -55, 0, -62.5, - 57.5, + 55, 0, 62.5, - 57.5, + 55, 0 ], "indexes": [ @@ -84,9 +84,9 @@ ], "uv": [ 0, - 115, + 110, 125, - 115, + 110, 0, 0, 125, @@ -104,12 +104,12 @@ ], "minPos": [ -62.5, - -57.5, + -55, 0 ], "maxPos": [ 62.5, - 57.5, + 55, 0 ] }, diff --git a/assets/Texture/HugBg.png b/assets/Texture/HugBg.png new file mode 100644 index 0000000..02bbec3 Binary files /dev/null and b/assets/Texture/HugBg.png differ diff --git a/assets/Texture/HugBg.png.meta b/assets/Texture/HugBg.png.meta new file mode 100644 index 0000000..ab49306 --- /dev/null +++ b/assets/Texture/HugBg.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "73f97d63-07b7-471f-9c62-b7707306a57c", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "73f97d63-07b7-471f-9c62-b7707306a57c@6c48a", + "displayName": "HugBg", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0, + "isUuid": true, + "imageUuidOrDatabaseUri": "73f97d63-07b7-471f-9c62-b7707306a57c", + "visible": false + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "73f97d63-07b7-471f-9c62-b7707306a57c@f9941", + "displayName": "HugBg", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 218, + "height": 72, + "rawWidth": 218, + "rawHeight": 72, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -109, + -36, + 0, + 109, + -36, + 0, + -109, + 36, + 0, + 109, + 36, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 72, + 218, + 72, + 0, + 0, + 218, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -109, + -36, + 0 + ], + "maxPos": [ + 109, + 36, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "73f97d63-07b7-471f-9c62-b7707306a57c@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "hasAlpha": true, + "type": "sprite-frame", + "fixAlphaTransparencyArtifacts": false, + "redirect": "73f97d63-07b7-471f-9c62-b7707306a57c@6c48a" + } +} diff --git a/assets/Texture/ICON_AD.png b/assets/Texture/ICON_AD.png index b590f57..02e50df 100644 Binary files a/assets/Texture/ICON_AD.png and b/assets/Texture/ICON_AD.png differ diff --git a/assets/Texture/ICON_AD.png.meta b/assets/Texture/ICON_AD.png.meta index 4c51bb0..a8cd080 100644 --- a/assets/Texture/ICON_AD.png.meta +++ b/assets/Texture/ICON_AD.png.meta @@ -43,12 +43,12 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": 0, - "trimX": 0, + "offsetY": 0.5, + "trimX": 1, "trimY": 0, - "width": 62, - "height": 36, - "rawWidth": 62, + "width": 40, + "height": 35, + "rawWidth": 42, "rawHeight": 36, "borderTop": 0, "borderBottom": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -31, - -18, + -20, + -17.5, 0, - 31, - -18, + 20, + -17.5, 0, - -31, - 18, + -20, + 17.5, 0, - 31, - 18, + 20, + 17.5, 0 ], "indexes": [ @@ -83,33 +83,33 @@ 3 ], "uv": [ - 0, + 1, 36, - 62, + 41, 36, - 0, - 0, - 62, - 0 + 1, + 1, + 41, + 1 ], "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, + 0.023809523809523808, + 0.027777777777777776, + 0.9761904761904762, + 0.027777777777777776, + 0.023809523809523808, 1, + 0.9761904761904762, 1 ], "minPos": [ - -31, - -18, + -20, + -17.5, 0 ], "maxPos": [ - 31, - 18, + 20, + 17.5, 0 ] }, diff --git a/assets/Texture/ICON_AD2.png b/assets/Texture/ICON_AD2.png new file mode 100644 index 0000000..ab397e2 Binary files /dev/null and b/assets/Texture/ICON_AD2.png differ diff --git a/assets/Texture/ICON_AD2.png.meta b/assets/Texture/ICON_AD2.png.meta new file mode 100644 index 0000000..3b69f94 --- /dev/null +++ b/assets/Texture/ICON_AD2.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "0e6df75d-287a-4e82-b6fc-9cbb027cdb24", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "0e6df75d-287a-4e82-b6fc-9cbb027cdb24@6c48a", + "displayName": "ICON_AD2", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0, + "isUuid": true, + "imageUuidOrDatabaseUri": "0e6df75d-287a-4e82-b6fc-9cbb027cdb24", + "visible": false + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "0e6df75d-287a-4e82-b6fc-9cbb027cdb24@f9941", + "displayName": "ICON_AD2", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 408, + "height": 314, + "rawWidth": 408, + "rawHeight": 314, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -204, + -157, + 0, + 204, + -157, + 0, + -204, + 157, + 0, + 204, + 157, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 314, + 408, + 314, + 0, + 0, + 408, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -204, + -157, + 0 + ], + "maxPos": [ + 204, + 157, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "0e6df75d-287a-4e82-b6fc-9cbb027cdb24@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "hasAlpha": true, + "type": "sprite-frame", + "fixAlphaTransparencyArtifacts": false, + "redirect": "0e6df75d-287a-4e82-b6fc-9cbb027cdb24@6c48a" + } +} diff --git a/assets/Texture/ICON_AlienAvarta_Color.png b/assets/Texture/ICON_AlienAvarta_Color.png index b4ff5b7..25bead1 100644 Binary files a/assets/Texture/ICON_AlienAvarta_Color.png and b/assets/Texture/ICON_AlienAvarta_Color.png differ diff --git a/assets/Texture/ICON_AlienAvarta_Color.png.meta b/assets/Texture/ICON_AlienAvarta_Color.png.meta index d44c54b..de01740 100644 --- a/assets/Texture/ICON_AlienAvarta_Color.png.meta +++ b/assets/Texture/ICON_AlienAvarta_Color.png.meta @@ -47,9 +47,9 @@ "trimX": 0, "trimY": 0, "width": 54, - "height": 65, + "height": 63, "rawWidth": 54, - "rawHeight": 65, + "rawHeight": 63, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -62,16 +62,16 @@ "vertices": { "rawPosition": [ -27, - -32.5, + -31.5, 0, 27, - -32.5, + -31.5, 0, -27, - 32.5, + 31.5, 0, 27, - 32.5, + 31.5, 0 ], "indexes": [ @@ -84,9 +84,9 @@ ], "uv": [ 0, - 65, + 63, 54, - 65, + 63, 0, 0, 54, @@ -104,12 +104,12 @@ ], "minPos": [ -27, - -32.5, + -31.5, 0 ], "maxPos": [ 27, - 32.5, + 31.5, 0 ] }, diff --git a/assets/Texture/ICON_AlienAvarta_Gray.png b/assets/Texture/ICON_AlienAvarta_Gray.png index 994871b..8d3163c 100644 Binary files a/assets/Texture/ICON_AlienAvarta_Gray.png and b/assets/Texture/ICON_AlienAvarta_Gray.png differ diff --git a/assets/Texture/ICON_AlienAvarta_Gray.png.meta b/assets/Texture/ICON_AlienAvarta_Gray.png.meta index f4c3f0e..99c5282 100644 --- a/assets/Texture/ICON_AlienAvarta_Gray.png.meta +++ b/assets/Texture/ICON_AlienAvarta_Gray.png.meta @@ -47,9 +47,9 @@ "trimX": 0, "trimY": 0, "width": 54, - "height": 65, + "height": 63, "rawWidth": 54, - "rawHeight": 65, + "rawHeight": 63, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -62,16 +62,16 @@ "vertices": { "rawPosition": [ -27, - -32.5, + -31.5, 0, 27, - -32.5, + -31.5, 0, -27, - 32.5, + 31.5, 0, 27, - 32.5, + 31.5, 0 ], "indexes": [ @@ -84,9 +84,9 @@ ], "uv": [ 0, - 65, + 63, 54, - 65, + 63, 0, 0, 54, @@ -104,12 +104,12 @@ ], "minPos": [ -27, - -32.5, + -31.5, 0 ], "maxPos": [ 27, - 32.5, + 31.5, 0 ] }, diff --git a/assets/Texture/ICON_music.png b/assets/Texture/ICON_music.png index aa5d53b..d764dc0 100644 Binary files a/assets/Texture/ICON_music.png and b/assets/Texture/ICON_music.png differ diff --git a/assets/Texture/ICON_music.png.meta b/assets/Texture/ICON_music.png.meta index bbc0ce0..91eeb64 100644 --- a/assets/Texture/ICON_music.png.meta +++ b/assets/Texture/ICON_music.png.meta @@ -46,9 +46,9 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 88, + "width": 82, "height": 96, - "rawWidth": 88, + "rawWidth": 82, "rawHeight": 96, "borderTop": 0, "borderBottom": 0, @@ -61,16 +61,16 @@ "meshType": 0, "vertices": { "rawPosition": [ - -44, + -41, -48, 0, - 44, + 41, -48, 0, - -44, + -41, 48, 0, - 44, + 41, 48, 0 ], @@ -85,11 +85,11 @@ "uv": [ 0, 96, - 88, + 82, 96, 0, 0, - 88, + 82, 0 ], "nuv": [ @@ -103,12 +103,12 @@ 1 ], "minPos": [ - -44, + -41, -48, 0 ], "maxPos": [ - 44, + 41, 48, 0 ] diff --git a/assets/Texture/ICON_sound.png b/assets/Texture/ICON_sound.png index bf8bfde..8c2d945 100644 Binary files a/assets/Texture/ICON_sound.png and b/assets/Texture/ICON_sound.png differ diff --git a/assets/Texture/ICON_sound.png.meta b/assets/Texture/ICON_sound.png.meta index db6e20f..9477e4d 100644 --- a/assets/Texture/ICON_sound.png.meta +++ b/assets/Texture/ICON_sound.png.meta @@ -47,9 +47,9 @@ "trimX": 0, "trimY": 0, "width": 96, - "height": 96, + "height": 86, "rawWidth": 96, - "rawHeight": 96, + "rawHeight": 86, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -62,16 +62,16 @@ "vertices": { "rawPosition": [ -48, - -48, + -43, 0, 48, - -48, + -43, 0, -48, - 48, + 43, 0, 48, - 48, + 43, 0 ], "indexes": [ @@ -84,9 +84,9 @@ ], "uv": [ 0, + 86, 96, - 96, - 96, + 86, 0, 0, 96, @@ -104,12 +104,12 @@ ], "minPos": [ -48, - -48, + -43, 0 ], "maxPos": [ 48, - 48, + 43, 0 ] }, diff --git a/assets/Texture/Loading.png b/assets/Texture/Loading.png index e4a8950..05a2edb 100644 Binary files a/assets/Texture/Loading.png and b/assets/Texture/Loading.png differ diff --git a/assets/Texture/Loading.png.meta b/assets/Texture/Loading.png.meta index 9d04030..cdaa30c 100644 --- a/assets/Texture/Loading.png.meta +++ b/assets/Texture/Loading.png.meta @@ -42,14 +42,14 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, + "offsetX": 1, + "offsetY": 2.5, + "trimX": 3, "trimY": 0, - "width": 717, - "height": 125, - "rawWidth": 717, - "rawHeight": 125, + "width": 1733, + "height": 901, + "rawWidth": 1737, + "rawHeight": 906, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -358.5, - -62.5, + -866.5, + -450.5, 0, - 358.5, - -62.5, + 866.5, + -450.5, 0, - -358.5, - 62.5, + -866.5, + 450.5, 0, - 358.5, - 62.5, + 866.5, + 450.5, 0 ], "indexes": [ @@ -83,33 +83,33 @@ 3 ], "uv": [ - 0, - 125, - 717, - 125, - 0, - 0, - 717, - 0 + 3, + 906, + 1736, + 906, + 3, + 5, + 1736, + 5 ], "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, + 0.0017271157167530224, + 0.005518763796909493, + 0.9994242947610823, + 0.005518763796909493, + 0.0017271157167530224, 1, + 0.9994242947610823, 1 ], "minPos": [ - -358.5, - -62.5, + -866.5, + -450.5, 0 ], "maxPos": [ - 358.5, - 62.5, + 866.5, + 450.5, 0 ] }, diff --git a/assets/Texture/Lose_Alien.png b/assets/Texture/Lose_Alien.png index 17af355..46731b6 100644 Binary files a/assets/Texture/Lose_Alien.png and b/assets/Texture/Lose_Alien.png differ diff --git a/assets/Texture/Lose_Alien.png.meta b/assets/Texture/Lose_Alien.png.meta index 26bbe36..9906d9b 100644 --- a/assets/Texture/Lose_Alien.png.meta +++ b/assets/Texture/Lose_Alien.png.meta @@ -47,9 +47,9 @@ "trimX": 0, "trimY": 0, "width": 771, - "height": 801, + "height": 640, "rawWidth": 771, - "rawHeight": 801, + "rawHeight": 640, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -62,16 +62,16 @@ "vertices": { "rawPosition": [ -385.5, - -400.5, + -320, 0, 385.5, - -400.5, + -320, 0, -385.5, - 400.5, + 320, 0, 385.5, - 400.5, + 320, 0 ], "indexes": [ @@ -84,9 +84,9 @@ ], "uv": [ 0, - 801, + 640, 771, - 801, + 640, 0, 0, 771, @@ -104,12 +104,12 @@ ], "minPos": [ -385.5, - -400.5, + -320, 0 ], "maxPos": [ 385.5, - 400.5, + 320, 0 ] }, diff --git a/assets/Texture/MessegePanel.png b/assets/Texture/MessegePanel.png index 25793eb..05d0dc0 100644 Binary files a/assets/Texture/MessegePanel.png and b/assets/Texture/MessegePanel.png differ diff --git a/assets/Texture/MessegePanel.png.meta b/assets/Texture/MessegePanel.png.meta index e287018..58cdcc2 100644 --- a/assets/Texture/MessegePanel.png.meta +++ b/assets/Texture/MessegePanel.png.meta @@ -47,9 +47,9 @@ "trimX": 0, "trimY": 0, "width": 626, - "height": 805, + "height": 678, "rawWidth": 626, - "rawHeight": 805, + "rawHeight": 678, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -62,16 +62,16 @@ "vertices": { "rawPosition": [ -313, - -402.5, + -339, 0, 313, - -402.5, + -339, 0, -313, - 402.5, + 339, 0, 313, - 402.5, + 339, 0 ], "indexes": [ @@ -84,9 +84,9 @@ ], "uv": [ 0, - 805, + 678, 626, - 805, + 678, 0, 0, 626, @@ -104,12 +104,12 @@ ], "minPos": [ -313, - -402.5, + -339, 0 ], "maxPos": [ 313, - 402.5, + 339, 0 ] }, diff --git a/assets/Texture/Money.png b/assets/Texture/Money.png index f97739a..f96cfd4 100644 Binary files a/assets/Texture/Money.png and b/assets/Texture/Money.png differ diff --git a/assets/Texture/Money.png.meta b/assets/Texture/Money.png.meta index ccc366e..cd1b826 100644 --- a/assets/Texture/Money.png.meta +++ b/assets/Texture/Money.png.meta @@ -44,12 +44,12 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 110, - "height": 111, + "trimX": 2, + "trimY": 2, + "width": 106, + "height": 102, "rawWidth": 110, - "rawHeight": 111, + "rawHeight": 106, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -55, - -55.5, + -53, + -51, 0, - 55, - -55.5, + 53, + -51, 0, - -55, - 55.5, + -53, + 51, 0, - 55, - 55.5, + 53, + 51, 0 ], "indexes": [ @@ -83,33 +83,33 @@ 3 ], "uv": [ - 0, - 111, - 110, - 111, - 0, - 0, - 110, - 0 + 2, + 104, + 108, + 104, + 2, + 2, + 108, + 2 ], "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 + 0.01818181818181818, + 0.018867924528301886, + 0.9818181818181818, + 0.018867924528301886, + 0.01818181818181818, + 0.9811320754716981, + 0.9818181818181818, + 0.9811320754716981 ], "minPos": [ - -55, - -55.5, + -53, + -51, 0 ], "maxPos": [ - 55, - 55.5, + 53, + 51, 0 ] }, diff --git a/assets/Texture/Panel_Popup.png b/assets/Texture/Panel_Popup.png index 1daad3e..1e006ad 100644 Binary files a/assets/Texture/Panel_Popup.png and b/assets/Texture/Panel_Popup.png differ diff --git a/assets/Texture/Panel_Popup.png.meta b/assets/Texture/Panel_Popup.png.meta index 0f0ecc2..88b120a 100644 --- a/assets/Texture/Panel_Popup.png.meta +++ b/assets/Texture/Panel_Popup.png.meta @@ -47,11 +47,11 @@ "trimX": 0, "trimY": 0, "width": 368, - "height": 313, + "height": 269, "rawWidth": 368, - "rawHeight": 313, + "rawHeight": 269, "borderTop": 159, - "borderBottom": 113, + "borderBottom": 110, "borderLeft": 167, "borderRight": 168, "packable": true, @@ -62,16 +62,16 @@ "vertices": { "rawPosition": [ -184, - -156.5, + -134.5, 0, 184, - -156.5, + -134.5, 0, -184, - 156.5, + 134.5, 0, 184, - 156.5, + 134.5, 0 ], "indexes": [ @@ -84,9 +84,9 @@ ], "uv": [ 0, - 313, + 269, 368, - 313, + 269, 0, 0, 368, @@ -104,12 +104,12 @@ ], "minPos": [ -184, - -156.5, + -134.5, 0 ], "maxPos": [ 184, - 156.5, + 134.5, 0 ] }, diff --git a/assets/Texture/Panel_Popup_setting.png b/assets/Texture/Panel_Popup_setting.png new file mode 100644 index 0000000..90ad32d Binary files /dev/null and b/assets/Texture/Panel_Popup_setting.png differ diff --git a/assets/Texture/Panel_Popup_setting.png.meta b/assets/Texture/Panel_Popup_setting.png.meta new file mode 100644 index 0000000..479a9c5 --- /dev/null +++ b/assets/Texture/Panel_Popup_setting.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "6fc21102-49f7-45af-b0ae-ac8427e0a348", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "6fc21102-49f7-45af-b0ae-ac8427e0a348@6c48a", + "displayName": "Panel_Popup_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": "6fc21102-49f7-45af-b0ae-ac8427e0a348", + "visible": false + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "6fc21102-49f7-45af-b0ae-ac8427e0a348@f9941", + "displayName": "Panel_Popup_setting", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 927, + "height": 914, + "rawWidth": 927, + "rawHeight": 914, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -463.5, + -457, + 0, + 463.5, + -457, + 0, + -463.5, + 457, + 0, + 463.5, + 457, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 914, + 927, + 914, + 0, + 0, + 927, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -463.5, + -457, + 0 + ], + "maxPos": [ + 463.5, + 457, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "6fc21102-49f7-45af-b0ae-ac8427e0a348@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "hasAlpha": true, + "type": "sprite-frame", + "fixAlphaTransparencyArtifacts": false, + "redirect": "6fc21102-49f7-45af-b0ae-ac8427e0a348@6c48a" + } +} diff --git a/assets/Texture/Reward_LIne.png b/assets/Texture/Reward_LIne.png index e907322..20c75ba 100644 Binary files a/assets/Texture/Reward_LIne.png and b/assets/Texture/Reward_LIne.png differ diff --git a/assets/Texture/Saomiao.png b/assets/Texture/Saomiao.png index 05de532..00a0298 100644 Binary files a/assets/Texture/Saomiao.png and b/assets/Texture/Saomiao.png differ diff --git a/assets/Texture/Toggle_Close.png b/assets/Texture/Toggle_Close.png index 89eb45d..2eb1edd 100644 Binary files a/assets/Texture/Toggle_Close.png and b/assets/Texture/Toggle_Close.png differ diff --git a/assets/Texture/Toggle_Close.png.meta b/assets/Texture/Toggle_Close.png.meta index bfe40cd..f908dda 100644 --- a/assets/Texture/Toggle_Close.png.meta +++ b/assets/Texture/Toggle_Close.png.meta @@ -46,9 +46,9 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 192, + "width": 166, "height": 87, - "rawWidth": 192, + "rawWidth": 166, "rawHeight": 87, "borderTop": 0, "borderBottom": 0, @@ -61,16 +61,16 @@ "meshType": 0, "vertices": { "rawPosition": [ - -96, + -83, -43.5, 0, - 96, + 83, -43.5, 0, - -96, + -83, 43.5, 0, - 96, + 83, 43.5, 0 ], @@ -85,11 +85,11 @@ "uv": [ 0, 87, - 192, + 166, 87, 0, 0, - 192, + 166, 0 ], "nuv": [ @@ -103,12 +103,12 @@ 1 ], "minPos": [ - -96, + -83, -43.5, 0 ], "maxPos": [ - 96, + 83, 43.5, 0 ] diff --git a/assets/Texture/Toggle_Open.png b/assets/Texture/Toggle_Open.png index d74f88c..01a80d2 100644 Binary files a/assets/Texture/Toggle_Open.png and b/assets/Texture/Toggle_Open.png differ diff --git a/assets/Texture/Toggle_Open.png.meta b/assets/Texture/Toggle_Open.png.meta index da4ba29..9492094 100644 --- a/assets/Texture/Toggle_Open.png.meta +++ b/assets/Texture/Toggle_Open.png.meta @@ -42,13 +42,13 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 194, - "height": 92, - "rawWidth": 194, + "offsetX": 0.5, + "offsetY": 2, + "trimX": 15, + "trimY": 20, + "width": 109, + "height": 48, + "rawWidth": 138, "rawHeight": 92, "borderTop": 0, "borderBottom": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -97, - -46, + -54.5, + -24, 0, - 97, - -46, + 54.5, + -24, 0, - -97, - 46, + -54.5, + 24, 0, - 97, - 46, + 54.5, + 24, 0 ], "indexes": [ @@ -83,33 +83,33 @@ 3 ], "uv": [ - 0, - 92, - 194, - 92, - 0, - 0, - 194, - 0 + 15, + 72, + 124, + 72, + 15, + 24, + 124, + 24 ], "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 + 0.10869565217391304, + 0.2608695652173913, + 0.8985507246376812, + 0.2608695652173913, + 0.10869565217391304, + 0.782608695652174, + 0.8985507246376812, + 0.782608695652174 ], "minPos": [ - -97, - -46, + -54.5, + -24, 0 ], "maxPos": [ - 97, - 46, + 54.5, + 24, 0 ] }, diff --git a/assets/Texture/TopHud_time.png b/assets/Texture/TopHud_time.png index 8c1333e..3a94e42 100644 Binary files a/assets/Texture/TopHud_time.png and b/assets/Texture/TopHud_time.png differ diff --git a/assets/Texture/TopHud_time.png.meta b/assets/Texture/TopHud_time.png.meta index 7a29e03..7e5f2e5 100644 --- a/assets/Texture/TopHud_time.png.meta +++ b/assets/Texture/TopHud_time.png.meta @@ -47,9 +47,9 @@ "trimX": 0, "trimY": 0, "width": 91, - "height": 112, + "height": 107, "rawWidth": 91, - "rawHeight": 112, + "rawHeight": 107, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -62,16 +62,16 @@ "vertices": { "rawPosition": [ -45.5, - -56, + -53.5, 0, 45.5, - -56, + -53.5, 0, -45.5, - 56, + 53.5, 0, 45.5, - 56, + 53.5, 0 ], "indexes": [ @@ -84,9 +84,9 @@ ], "uv": [ 0, - 112, + 107, 91, - 112, + 107, 0, 0, 91, @@ -104,12 +104,12 @@ ], "minPos": [ -45.5, - -56, + -53.5, 0 ], "maxPos": [ 45.5, - 56, + 53.5, 0 ] }, diff --git a/assets/Texture/Wheel_Arrow.png b/assets/Texture/Wheel_Arrow.png index db52e9d..a65e0ca 100644 Binary files a/assets/Texture/Wheel_Arrow.png and b/assets/Texture/Wheel_Arrow.png differ diff --git a/assets/Texture/Wheel_Arrow.png.meta b/assets/Texture/Wheel_Arrow.png.meta index 1c2d7e3..eb91a1d 100644 --- a/assets/Texture/Wheel_Arrow.png.meta +++ b/assets/Texture/Wheel_Arrow.png.meta @@ -46,9 +46,9 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 95, + "width": 76, "height": 95, - "rawWidth": 95, + "rawWidth": 76, "rawHeight": 95, "borderTop": 0, "borderBottom": 0, @@ -61,16 +61,16 @@ "meshType": 0, "vertices": { "rawPosition": [ - -47.5, + -38, -47.5, 0, - 47.5, + 38, -47.5, 0, - -47.5, + -38, 47.5, 0, - 47.5, + 38, 47.5, 0 ], @@ -85,11 +85,11 @@ "uv": [ 0, 95, - 95, + 76, 95, 0, 0, - 95, + 76, 0 ], "nuv": [ @@ -103,12 +103,12 @@ 1 ], "minPos": [ - -47.5, + -38, -47.5, 0 ], "maxPos": [ - 47.5, + 38, 47.5, 0 ] diff --git a/assets/Texture/Zhunxing.png b/assets/Texture/Zhunxing.png index 53e7e33..3d014d3 100644 Binary files a/assets/Texture/Zhunxing.png and b/assets/Texture/Zhunxing.png differ diff --git a/assets/Texture/Zhunxing.png.meta b/assets/Texture/Zhunxing.png.meta index 5fbaccf..cc55f57 100644 --- a/assets/Texture/Zhunxing.png.meta +++ b/assets/Texture/Zhunxing.png.meta @@ -46,9 +46,9 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 103, + "width": 101, "height": 103, - "rawWidth": 103, + "rawWidth": 101, "rawHeight": 103, "borderTop": 0, "borderBottom": 0, @@ -61,16 +61,16 @@ "meshType": 0, "vertices": { "rawPosition": [ - -51.5, + -50.5, -51.5, 0, - 51.5, + 50.5, -51.5, 0, - -51.5, + -50.5, 51.5, 0, - 51.5, + 50.5, 51.5, 0 ], @@ -85,11 +85,11 @@ "uv": [ 0, 103, - 103, + 101, 103, 0, 0, - 103, + 101, 0 ], "nuv": [ @@ -103,12 +103,12 @@ 1 ], "minPos": [ - -51.5, + -50.5, -51.5, 0 ], "maxPos": [ - 51.5, + 50.5, 51.5, 0 ] diff --git a/assets/Texture/add.png b/assets/Texture/add.png new file mode 100644 index 0000000..1d0bf2e Binary files /dev/null and b/assets/Texture/add.png differ diff --git a/assets/Texture/add.png.meta b/assets/Texture/add.png.meta new file mode 100644 index 0000000..0e204d5 --- /dev/null +++ b/assets/Texture/add.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "df9ed47d-4c94-4043-9541-f8a800a09501", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "df9ed47d-4c94-4043-9541-f8a800a09501@6c48a", + "displayName": "add", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0, + "isUuid": true, + "imageUuidOrDatabaseUri": "df9ed47d-4c94-4043-9541-f8a800a09501", + "visible": false + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "df9ed47d-4c94-4043-9541-f8a800a09501@f9941", + "displayName": "add", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 10, + "trimY": 10, + "width": 184, + "height": 185, + "rawWidth": 204, + "rawHeight": 205, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -92, + -92.5, + 0, + 92, + -92.5, + 0, + -92, + 92.5, + 0, + 92, + 92.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 10, + 195, + 194, + 195, + 10, + 10, + 194, + 10 + ], + "nuv": [ + 0.049019607843137254, + 0.04878048780487805, + 0.9509803921568627, + 0.04878048780487805, + 0.049019607843137254, + 0.9512195121951219, + 0.9509803921568627, + 0.9512195121951219 + ], + "minPos": [ + -92, + -92.5, + 0 + ], + "maxPos": [ + 92, + 92.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "df9ed47d-4c94-4043-9541-f8a800a09501@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "hasAlpha": true, + "type": "sprite-frame", + "fixAlphaTransparencyArtifacts": false, + "redirect": "df9ed47d-4c94-4043-9541-f8a800a09501@6c48a" + } +} diff --git a/assets/Texture/bg.jpg b/assets/Texture/bg.jpg deleted file mode 100644 index 6c18115..0000000 Binary files a/assets/Texture/bg.jpg and /dev/null differ diff --git a/assets/Texture/bg.png b/assets/Texture/bg.png new file mode 100644 index 0000000..1d2fde6 Binary files /dev/null and b/assets/Texture/bg.png differ diff --git a/assets/Texture/bg.jpg.meta b/assets/Texture/bg.png.meta similarity index 69% rename from assets/Texture/bg.jpg.meta rename to assets/Texture/bg.png.meta index e211891..ff515b6 100644 --- a/assets/Texture/bg.jpg.meta +++ b/assets/Texture/bg.png.meta @@ -2,27 +2,27 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "91f8d9d0-9fa3-4671-8483-96b24934f255", + "uuid": "e50ce6ea-1fcb-4273-a961-3c6ad1b3c8d3", "files": [ - ".jpg", - ".json" + ".json", + ".png" ], "subMetas": { "6c48a": { "importer": "texture", - "uuid": "91f8d9d0-9fa3-4671-8483-96b24934f255@6c48a", + "uuid": "e50ce6ea-1fcb-4273-a961-3c6ad1b3c8d3@6c48a", "displayName": "bg", "id": "6c48a", "name": "texture", "userData": { - "wrapModeS": "clamp-to-edge", - "wrapModeT": "clamp-to-edge", + "wrapModeS": "repeat", + "wrapModeT": "repeat", "minfilter": "linear", "magfilter": "linear", "mipfilter": "none", "anisotropy": 0, "isUuid": true, - "imageUuidOrDatabaseUri": "91f8d9d0-9fa3-4671-8483-96b24934f255", + "imageUuidOrDatabaseUri": "e50ce6ea-1fcb-4273-a961-3c6ad1b3c8d3", "visible": false }, "ver": "1.0.22", @@ -34,7 +34,7 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "91f8d9d0-9fa3-4671-8483-96b24934f255@f9941", + "uuid": "e50ce6ea-1fcb-4273-a961-3c6ad1b3c8d3@f9941", "displayName": "bg", "id": "f9941", "name": "spriteFrame", @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 1080, - "height": 2160, - "rawWidth": 1080, - "rawHeight": 2160, + "width": 1536, + "height": 2752, + "rawWidth": 1536, + "rawHeight": 2752, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -540, - -1080, + -768, + -1376, 0, - 540, - -1080, + 768, + -1376, 0, - -540, - 1080, + -768, + 1376, 0, - 540, - 1080, + 768, + 1376, 0 ], "indexes": [ @@ -84,12 +84,12 @@ ], "uv": [ 0, - 2160, - 1080, - 2160, + 2752, + 1536, + 2752, 0, 0, - 1080, + 1536, 0 ], "nuv": [ @@ -103,18 +103,18 @@ 1 ], "minPos": [ - -540, - -1080, + -768, + -1376, 0 ], "maxPos": [ - 540, - 1080, + 768, + 1376, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "91f8d9d0-9fa3-4671-8483-96b24934f255@6c48a", + "imageUuidOrDatabaseUri": "e50ce6ea-1fcb-4273-a961-3c6ad1b3c8d3@6c48a", "atlasUuid": "" }, "ver": "1.0.12", @@ -129,6 +129,6 @@ "hasAlpha": false, "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, - "redirect": "91f8d9d0-9fa3-4671-8483-96b24934f255@6c48a" + "redirect": "e50ce6ea-1fcb-4273-a961-3c6ad1b3c8d3@6c48a" } } diff --git a/assets/Texture/bule-bg.png b/assets/Texture/bule-bg.png new file mode 100644 index 0000000..720dff1 Binary files /dev/null and b/assets/Texture/bule-bg.png differ diff --git a/assets/Texture/bule-bg.png.meta b/assets/Texture/bule-bg.png.meta new file mode 100644 index 0000000..2ec4f54 --- /dev/null +++ b/assets/Texture/bule-bg.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "148fb523-e849-4e06-8fdf-37fb123b570c", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "148fb523-e849-4e06-8fdf-37fb123b570c@6c48a", + "displayName": "bule-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": "148fb523-e849-4e06-8fdf-37fb123b570c", + "visible": false + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "148fb523-e849-4e06-8fdf-37fb123b570c@f9941", + "displayName": "bule-bg", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 814, + "height": 215, + "rawWidth": 814, + "rawHeight": 215, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -407, + -107.5, + 0, + 407, + -107.5, + 0, + -407, + 107.5, + 0, + 407, + 107.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 215, + 814, + 215, + 0, + 0, + 814, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -407, + -107.5, + 0 + ], + "maxPos": [ + 407, + 107.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "148fb523-e849-4e06-8fdf-37fb123b570c@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "hasAlpha": true, + "type": "sprite-frame", + "fixAlphaTransparencyArtifacts": false, + "redirect": "148fb523-e849-4e06-8fdf-37fb123b570c@6c48a" + } +} diff --git a/assets/Texture/energy.png b/assets/Texture/energy.png new file mode 100644 index 0000000..03109db Binary files /dev/null and b/assets/Texture/energy.png differ diff --git a/assets/Texture/energy.png.meta b/assets/Texture/energy.png.meta new file mode 100644 index 0000000..3b1d5a7 --- /dev/null +++ b/assets/Texture/energy.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "261f7859-d3f7-4fd7-8bac-20d9d664c002", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "261f7859-d3f7-4fd7-8bac-20d9d664c002@6c48a", + "displayName": "energy", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0, + "isUuid": true, + "imageUuidOrDatabaseUri": "261f7859-d3f7-4fd7-8bac-20d9d664c002", + "visible": false + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "261f7859-d3f7-4fd7-8bac-20d9d664c002@f9941", + "displayName": "energy", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 1147, + "height": 195, + "rawWidth": 1147, + "rawHeight": 195, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -573.5, + -97.5, + 0, + 573.5, + -97.5, + 0, + -573.5, + 97.5, + 0, + 573.5, + 97.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 195, + 1147, + 195, + 0, + 0, + 1147, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -573.5, + -97.5, + 0 + ], + "maxPos": [ + 573.5, + 97.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "261f7859-d3f7-4fd7-8bac-20d9d664c002@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "hasAlpha": true, + "type": "sprite-frame", + "fixAlphaTransparencyArtifacts": false, + "redirect": "261f7859-d3f7-4fd7-8bac-20d9d664c002@6c48a" + } +} diff --git a/assets/Texture/sight_mirror.png b/assets/Texture/sight_mirror.png index 853acf5..e9cdca0 100644 Binary files a/assets/Texture/sight_mirror.png and b/assets/Texture/sight_mirror.png differ diff --git a/assets/Texture/sight_mirror.png.meta b/assets/Texture/sight_mirror.png.meta index 9931905..e6a1f0e 100644 --- a/assets/Texture/sight_mirror.png.meta +++ b/assets/Texture/sight_mirror.png.meta @@ -46,9 +46,9 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 1059, + "width": 1049, "height": 1059, - "rawWidth": 1059, + "rawWidth": 1049, "rawHeight": 1059, "borderTop": 0, "borderBottom": 0, @@ -61,16 +61,16 @@ "meshType": 0, "vertices": { "rawPosition": [ - -529.5, + -524.5, -529.5, 0, - 529.5, + 524.5, -529.5, 0, - -529.5, + -524.5, 529.5, 0, - 529.5, + 524.5, 529.5, 0 ], @@ -85,11 +85,11 @@ "uv": [ 0, 1059, - 1059, + 1049, 1059, 0, 0, - 1059, + 1049, 0 ], "nuv": [ @@ -103,12 +103,12 @@ 1 ], "minPos": [ - -529.5, + -524.5, -529.5, 0 ], "maxPos": [ - 529.5, + 524.5, 529.5, 0 ] diff --git a/assets/Texture/title.png b/assets/Texture/title.png index d1165c0..a830e53 100644 Binary files a/assets/Texture/title.png and b/assets/Texture/title.png differ diff --git a/assets/Texture/title.png.meta b/assets/Texture/title.png.meta index 8f1fa53..96ae1d2 100644 --- a/assets/Texture/title.png.meta +++ b/assets/Texture/title.png.meta @@ -42,13 +42,13 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": 0, - "offsetY": 0, + "offsetX": -47.5, + "offsetY": 16.5, "trimX": 0, - "trimY": 0, - "width": 1080, - "height": 637, - "rawWidth": 1080, + "trimY": 54, + "width": 778, + "height": 496, + "rawWidth": 873, "rawHeight": 637, "borderTop": 0, "borderBottom": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -540, - -318.5, + -389, + -248, 0, - 540, - -318.5, + 389, + -248, 0, - -540, - 318.5, + -389, + 248, 0, - 540, - 318.5, + 389, + 248, 0 ], "indexes": [ @@ -84,32 +84,32 @@ ], "uv": [ 0, - 637, - 1080, - 637, + 583, + 778, + 583, 0, - 0, - 1080, - 0 + 87, + 778, + 87 ], "nuv": [ 0, + 0.13657770800627944, + 0.8911798396334479, + 0.13657770800627944, 0, - 1, - 0, - 0, - 1, - 1, - 1 + 0.9152276295133438, + 0.8911798396334479, + 0.9152276295133438 ], "minPos": [ - -540, - -318.5, + -389, + -248, 0 ], "maxPos": [ - 540, - 318.5, + 389, + 248, 0 ] }, diff --git a/assets/Texture/watch.png b/assets/Texture/watch.png new file mode 100644 index 0000000..0b6f822 Binary files /dev/null and b/assets/Texture/watch.png differ diff --git a/assets/Texture/watch.png.meta b/assets/Texture/watch.png.meta new file mode 100644 index 0000000..7ff8636 --- /dev/null +++ b/assets/Texture/watch.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "90dc6943-6ff7-4508-8685-05dca0dcb256", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "90dc6943-6ff7-4508-8685-05dca0dcb256@6c48a", + "displayName": "watch", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0, + "isUuid": true, + "imageUuidOrDatabaseUri": "90dc6943-6ff7-4508-8685-05dca0dcb256", + "visible": false + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "90dc6943-6ff7-4508-8685-05dca0dcb256@f9941", + "displayName": "watch", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 10, + "trimY": 10, + "width": 419, + "height": 230, + "rawWidth": 439, + "rawHeight": 250, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -209.5, + -115, + 0, + 209.5, + -115, + 0, + -209.5, + 115, + 0, + 209.5, + 115, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 10, + 240, + 429, + 240, + 10, + 10, + 429, + 10 + ], + "nuv": [ + 0.022779043280182234, + 0.04, + 0.9772209567198178, + 0.04, + 0.022779043280182234, + 0.96, + 0.9772209567198178, + 0.96 + ], + "minPos": [ + -209.5, + -115, + 0 + ], + "maxPos": [ + 209.5, + 115, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "90dc6943-6ff7-4508-8685-05dca0dcb256@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "hasAlpha": true, + "type": "sprite-frame", + "fixAlphaTransparencyArtifacts": false, + "redirect": "90dc6943-6ff7-4508-8685-05dca0dcb256@6c48a" + } +} diff --git a/assets/resources/ui/AddHeartPanel.prefab b/assets/resources/ui/AddHeartPanel.prefab index e480ce3..98b8df5 100644 --- a/assets/resources/ui/AddHeartPanel.prefab +++ b/assets/resources/ui/AddHeartPanel.prefab @@ -28,17 +28,17 @@ "_active": true, "_components": [ { - "__id__": 152 + "__id__": 164 }, { - "__id__": 154 + "__id__": 166 }, { - "__id__": 156 + "__id__": 168 } ], "_prefab": { - "__id__": 158 + "__id__": 170 }, "_lpos": { "__type__": "cc.Vec3", @@ -336,35 +336,38 @@ "__id__": 93 }, { - "__id__": 109 - }, - { - "__id__": 117 + "__id__": 115 }, { "__id__": 123 }, { - "__id__": 131 + "__id__": 129 }, { - "__id__": 139 + "__id__": 137 + }, + { + "__id__": 145 + }, + { + "__id__": 151 } ], "_active": true, "_components": [ { - "__id__": 145 + "__id__": 157 }, { - "__id__": 147 + "__id__": 159 }, { - "__id__": 149 + "__id__": 161 } ], "_prefab": { - "__id__": 151 + "__id__": 163 }, "_lpos": { "__type__": "cc.Vec3", @@ -803,7 +806,7 @@ "__id__": 12 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 30 @@ -1011,74 +1014,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "b4FxsqXmJG16OjEkqgLm8K" }, - { - "__type__": "cc.Label", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 35 - }, - "_enabled": true, - "__prefab": { - "__id__": 39 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_string": "Energy Station", - "_horizontalAlign": 1, - "_verticalAlign": 1, - "_actualFontSize": 60, - "_fontSize": 60, - "_fontFamily": "Arial", - "_lineHeight": 100, - "_overflow": 2, - "_enableWrapText": true, - "_font": null, - "_isSystemFontUsed": true, - "_spacingX": 0, - "_isItalic": false, - "_isBold": false, - "_isUnderline": false, - "_underlineHeight": 2, - "_cacheMode": 0, - "_enableOutline": true, - "_outlineColor": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_outlineWidth": 4, - "_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": "c9dOhtRr1BbL4ziRXAAaEv" - }, { "__type__": "cc.Widget", "_name": "", @@ -1089,7 +1024,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 41 + "__id__": 39 }, "_alignFlags": 17, "_target": null, @@ -1115,6 +1050,48 @@ "__type__": "cc.CompPrefabInfo", "fileId": "7foreeSgpHGYKW5//rG/gP" }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 35 + }, + "_enabled": true, + "__prefab": { + "__id__": 41 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": null, + "_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": "388gtv7vZPwIYJfNHrcaW9" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -2285,30 +2262,33 @@ "_children": [ { "__id__": 94 + }, + { + "__id__": 100 } ], "_active": true, "_components": [ - { - "__id__": 100 - }, - { - "__id__": 102 - }, - { - "__id__": 104 - }, { "__id__": 106 + }, + { + "__id__": 108 + }, + { + "__id__": 110 + }, + { + "__id__": 112 } ], "_prefab": { - "__id__": 108 + "__id__": 114 }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, - "y": -265.554, + "x": -2.225, + "y": -267.779, "z": 0 }, "_lrot": { @@ -2343,7 +2323,7 @@ "__id__": 93 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 95 @@ -2440,7 +2420,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -2470,6 +2450,142 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "ICON_AD2", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 93 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 101 + }, + { + "__id__": 103 + } + ], + "_prefab": { + "__id__": 105 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -254.99800000000005, + "y": -0.4900000000000091, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 0.456, + "y": 0.456, + "z": 0.228 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 100 + }, + "_enabled": true, + "__prefab": { + "__id__": 102 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 408, + "height": 314 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "fa1fUb5SRJaIAkXAHJUtgn" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 100 + }, + "_enabled": true, + "__prefab": { + "__id__": 104 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "0e6df75d-287a-4e82-b6fc-9cbb027cdb24@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": "7175qvulVKrKygQmv3JV0E" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "b7Yc9DG8RKUq/urDR3TTjg", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -2480,11 +2596,11 @@ }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 107 }, "_contentSize": { "__type__": "cc.Size", - "width": 551, + "width": 737.9, "height": 262 }, "_anchorPoint": { @@ -2508,7 +2624,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 109 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2553,15 +2669,15 @@ }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 111 }, "_alignFlags": 17, "_target": null, "_left": 0, "_right": 0, - "_top": 569.0319999999999, + "_top": 571.257, "_bottom": 0, - "_horizontalCenter": 0, + "_horizontalCenter": -2.225, "_verticalCenter": 0, "_isAbsLeft": true, "_isAbsRight": true, @@ -2589,7 +2705,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 107 + "__id__": 113 }, "clickEvents": [], "_interactable": true, @@ -2657,20 +2773,20 @@ "__id__": 12 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { - "__id__": 110 + "__id__": 116 }, { - "__id__": 112 + "__id__": 118 }, { - "__id__": 114 + "__id__": 120 } ], "_prefab": { - "__id__": 116 + "__id__": 122 }, "_lpos": { "__type__": "cc.Vec3", @@ -2707,11 +2823,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 109 + "__id__": 115 }, "_enabled": true, "__prefab": { - "__id__": 111 + "__id__": 117 }, "_contentSize": { "__type__": "cc.Size", @@ -2735,11 +2851,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 109 + "__id__": 115 }, "_enabled": true, "__prefab": { - "__id__": 113 + "__id__": 119 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2803,11 +2919,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 109 + "__id__": 115 }, "_enabled": true, "__prefab": { - "__id__": 115 + "__id__": 121 }, "_alignFlags": 17, "_target": null, @@ -2842,8 +2958,6 @@ "__id__": 0 }, "fileId": "56XDe8wbtFlIHre2jdxPbZ", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -2858,19 +2972,19 @@ "_active": true, "_components": [ { - "__id__": 118 + "__id__": 124 }, { - "__id__": 120 + "__id__": 126 } ], "_prefab": { - "__id__": 122 + "__id__": 128 }, "_lpos": { "__type__": "cc.Vec3", - "x": -95.932, - "y": -110.559, + "x": -142.087, + "y": -2.095, "z": 0 }, "_lrot": { @@ -2882,9 +2996,9 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 + "x": 1.35, + "y": 1.35, + "z": 2.756 }, "_mobility": 0, "_layer": 33554432, @@ -2902,11 +3016,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 117 + "__id__": 123 }, "_enabled": true, "__prefab": { - "__id__": 119 + "__id__": 125 }, "_contentSize": { "__type__": "cc.Size", @@ -2930,11 +3044,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 117 + "__id__": 123 }, "_enabled": true, "__prefab": { - "__id__": 121 + "__id__": 127 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2994,22 +3108,22 @@ "_active": true, "_components": [ { - "__id__": 124 + "__id__": 130 }, { - "__id__": 126 + "__id__": 132 }, { - "__id__": 128 + "__id__": 134 } ], "_prefab": { - "__id__": 130 + "__id__": 136 }, "_lpos": { "__type__": "cc.Vec3", "x": 22.989, - "y": -110.68799999999999, + "y": -2.2239999999999895, "z": 0 }, "_lrot": { @@ -3041,11 +3155,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 123 + "__id__": 129 }, "_enabled": true, "__prefab": { - "__id__": 125 + "__id__": 131 }, "_contentSize": { "__type__": "cc.Size", @@ -3069,11 +3183,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 123 + "__id__": 129 }, "_enabled": true, "__prefab": { - "__id__": 127 + "__id__": 133 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3137,17 +3251,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 123 + "__id__": 129 }, "_enabled": true, "__prefab": { - "__id__": 129 + "__id__": 135 }, "_alignFlags": 17, "_target": null, "_left": 0, "_right": 0, - "_top": 406.66599999999994, + "_top": 298.20199999999994, "_bottom": 0, "_horizontalCenter": 22.989, "_verticalCenter": 0, @@ -3192,22 +3306,22 @@ "_active": true, "_components": [ { - "__id__": 132 + "__id__": 138 }, { - "__id__": 134 + "__id__": 140 }, { - "__id__": 136 + "__id__": 142 } ], "_prefab": { - "__id__": 138 + "__id__": 144 }, "_lpos": { "__type__": "cc.Vec3", "x": 103.829, - "y": -108.85299999999998, + "y": -0.3889999999999816, "z": 0 }, "_lrot": { @@ -3239,11 +3353,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 131 + "__id__": 137 }, "_enabled": true, "__prefab": { - "__id__": 133 + "__id__": 139 }, "_contentSize": { "__type__": "cc.Size", @@ -3267,11 +3381,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 131 + "__id__": 137 }, "_enabled": true, "__prefab": { - "__id__": 135 + "__id__": 141 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3335,17 +3449,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 131 + "__id__": 137 }, "_enabled": true, "__prefab": { - "__id__": 137 + "__id__": 143 }, "_alignFlags": 17, "_target": null, "_left": 0, "_right": 0, - "_top": 392.23099999999994, + "_top": 283.76699999999994, "_bottom": 0, "_horizontalCenter": 103.829, "_verticalCenter": 0, @@ -3387,17 +3501,17 @@ "__id__": 12 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { - "__id__": 140 + "__id__": 146 }, { - "__id__": 142 + "__id__": 148 } ], "_prefab": { - "__id__": 144 + "__id__": 150 }, "_lpos": { "__type__": "cc.Vec3", @@ -3434,11 +3548,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 139 + "__id__": 145 }, "_enabled": true, "__prefab": { - "__id__": 141 + "__id__": 147 }, "_contentSize": { "__type__": "cc.Size", @@ -3462,11 +3576,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 139 + "__id__": 145 }, "_enabled": true, "__prefab": { - "__id__": 143 + "__id__": 149 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3514,6 +3628,142 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "energy", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 12 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 152 + }, + { + "__id__": 154 + } + ], + "_prefab": { + "__id__": 156 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -20.024999999999977, + "y": 300.3760000000002, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 0.59, + "y": 0.59, + "z": 0.411 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 151 + }, + "_enabled": true, + "__prefab": { + "__id__": 153 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 1147, + "height": 195 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "76ixLxXRpJoLTPxhKH+N2C" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 151 + }, + "_enabled": true, + "__prefab": { + "__id__": 155 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "261f7859-d3f7-4fd7-8bac-20d9d664c002@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": "15wkuP6xFAzZwFLXNpNE/w" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "9dTUeurS5FFoMtds2p9fb3", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -3524,7 +3774,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 146 + "__id__": 158 }, "_contentSize": { "__type__": "cc.Size", @@ -3552,7 +3802,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 148 + "__id__": 160 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3597,7 +3847,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 150 + "__id__": 162 }, "startPos": { "__type__": "cc.Vec3", @@ -3646,7 +3896,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 153 + "__id__": 165 }, "_contentSize": { "__type__": "cc.Size", @@ -3674,7 +3924,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 155 + "__id__": 167 }, "_alignFlags": 45, "_target": null, @@ -3710,10 +3960,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 157 + "__id__": 169 }, "addPower": { - "__id__": 106 + "__id__": 112 }, "closeBtn": { "__id__": 24 diff --git a/assets/resources/ui/LoadingPanel.prefab b/assets/resources/ui/LoadingPanel.prefab index 1b6a85f..3a9ef9d 100644 --- a/assets/resources/ui/LoadingPanel.prefab +++ b/assets/resources/ui/LoadingPanel.prefab @@ -23,25 +23,22 @@ }, { "__id__": 10 - }, - { - "__id__": 16 } ], "_active": true, "_components": [ - { - "__id__": 30 - }, { "__id__": 32 }, { "__id__": 34 + }, + { + "__id__": 36 } ], "_prefab": { - "__id__": 36 + "__id__": 38 }, "_lpos": { "__type__": "cc.Vec3", @@ -249,29 +246,89 @@ }, { "__type__": "cc.Node", - "_name": "TitleLabel", + "_name": "Progress", "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 1 }, - "_children": [], - "_active": true, - "_components": [ + "_children": [ { "__id__": 11 }, { - "__id__": 13 + "__id__": 17 + } + ], + "_active": true, + "_components": [ + { + "__id__": 25 + }, + { + "__id__": 27 + }, + { + "__id__": 29 } ], "_prefab": { - "__id__": 15 + "__id__": 31 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -520.62, + "y": -16.184999999999945, + "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": "Btn_start-001", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 10 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 12 + }, + { + "__id__": 14 + } + ], + "_prefab": { + "__id__": 16 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, "z": 0 }, "_lrot": { @@ -303,11 +360,150 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 11 }, "_enabled": true, "__prefab": { - "__id__": 12 + "__id__": 13 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 722, + "height": 384 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "99ZoZsIdVLkoQOvFMNFrZP" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 11 + }, + "_enabled": true, + "__prefab": { + "__id__": 15 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 2, + "g": 245, + "b": 235, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "6128b64c-6232-4423-a816-3a5492a68791@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 3, + "_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": "40D6SQc+BGf6K5jV0uNBth" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "4dREdqrC5B+5OYTDU8IJuv", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "TitleLabel", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 10 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 18 + }, + { + "__id__": 20 + }, + { + "__id__": 22 + } + ], + "_prefab": { + "__id__": 24 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -299.984, + "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__": 17 + }, + "_enabled": true, + "__prefab": { + "__id__": 19 }, "_contentSize": { "__type__": "cc.Size", @@ -331,11 +527,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 17 }, "_enabled": true, "__prefab": { - "__id__": 14 + "__id__": 21 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -350,7 +546,7 @@ "_string": "Aliens hide anywhere. Look carefully.", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 40, + "_actualFontSize": 36, "_fontSize": 40, "_fontFamily": "Arial", "_lineHeight": 200, @@ -393,6 +589,42 @@ "__type__": "cc.CompPrefabInfo", "fileId": "49Qx7WnHNIoIHQVJWl/k13" }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 17 + }, + "_enabled": true, + "__prefab": { + "__id__": 23 + }, + "_alignFlags": 17, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 363.984, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "daw3C2rKtI0ah9GcvwUGvf" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -406,215 +638,22 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, - { - "__type__": "cc.Node", - "_name": "Progress", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [ - { - "__id__": 17 - } - ], - "_active": true, - "_components": [ - { - "__id__": 23 - }, - { - "__id__": 25 - }, - { - "__id__": 27 - } - ], - "_prefab": { - "__id__": 29 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": -16.184999999999945, - "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": "Btn_start-001", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 16 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 18 - }, - { - "__id__": 20 - } - ], - "_prefab": { - "__id__": 22 - }, - "_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__": 17 + "__id__": 10 }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 26 }, "_contentSize": { "__type__": "cc.Size", - "width": 717, - "height": 125 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "99ZoZsIdVLkoQOvFMNFrZP" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 17 - }, - "_enabled": true, - "__prefab": { - "__id__": 21 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 2, - "g": 245, - "b": 235, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "6128b64c-6232-4423-a816-3a5492a68791@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 3, - "_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": "40D6SQc+BGf6K5jV0uNBth" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "4dREdqrC5B+5OYTDU8IJuv", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 16 - }, - "_enabled": true, - "__prefab": { - "__id__": 24 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 717, - "height": 125 + "width": 722, + "height": 384 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -633,11 +672,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 16 + "__id__": 10 }, "_enabled": true, "__prefab": { - "__id__": 26 + "__id__": 28 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -655,7 +694,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -678,18 +717,18 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 16 + "__id__": 10 }, "_enabled": true, "__prefab": { - "__id__": 28 + "__id__": 30 }, "_alignFlags": 4, "_target": null, "_left": 0, "_right": 0, "_top": 0, - "_bottom": 881.315, + "_bottom": 751.815, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -731,7 +770,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 31 + "__id__": 33 }, "_contentSize": { "__type__": "cc.Size", @@ -759,7 +798,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 33 + "__id__": 35 }, "_alignFlags": 45, "_target": null, @@ -795,10 +834,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 35 + "__id__": 37 }, "loadingSprite": { - "__id__": 20 + "__id__": 14 }, "fillDuration": 5, "_id": "" @@ -819,4 +858,4 @@ "instance": null, "targetOverrides": null } -] +] \ No newline at end of file diff --git a/assets/resources/ui/LosePanel.prefab b/assets/resources/ui/LosePanel.prefab index d00d8a9..7281502 100644 --- a/assets/resources/ui/LosePanel.prefab +++ b/assets/resources/ui/LosePanel.prefab @@ -37,23 +37,23 @@ "__id__": 46 }, { - "__id__": 58 + "__id__": 68 } ], "_active": true, "_components": [ { - "__id__": 66 + "__id__": 76 }, { - "__id__": 68 + "__id__": 78 }, { - "__id__": 70 + "__id__": 80 } ], "_prefab": { - "__id__": 72 + "__id__": 82 }, "_lpos": { "__type__": "cc.Vec3", @@ -438,7 +438,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -574,7 +574,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -713,7 +713,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -865,7 +865,7 @@ "__id__": 32 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 34 @@ -920,7 +920,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 227.8076171875, + "width": 159.7900390625, "height": 63 }, "_anchorPoint": { @@ -1011,8 +1011,6 @@ "__id__": 0 }, "fileId": "aeDA4ZynZMeof3Kf04m4F3", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -1071,7 +1069,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -1168,24 +1166,27 @@ "_children": [ { "__id__": 47 + }, + { + "__id__": 53 + }, + { + "__id__": 59 } ], "_active": true, "_components": [ { - "__id__": 53 - }, - { - "__id__": 55 + "__id__": 65 } ], "_prefab": { - "__id__": 57 + "__id__": 67 }, "_lpos": { "__type__": "cc.Vec3", - "x": -104.007, - "y": -371.132, + "x": -119.924, + "y": -371.856, "z": 0 }, "_lrot": { @@ -1213,7 +1214,7 @@ }, { "__type__": "cc.Node", - "_name": "Label-001", + "_name": "HugBg", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -1234,8 +1235,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 137.911, - "y": 0.59, + "x": 125.557, + "y": 3.216, "z": 0 }, "_lrot": { @@ -1275,7 +1276,143 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 177.8076171875, + "width": 309.7, + "height": 70.2 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "acumnV495G2ro74rTvaaxd" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 47 + }, + "_enabled": true, + "__prefab": { + "__id__": 51 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "73f97d63-07b7-471f-9c62-b7707306a57c@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_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": "a5Wx/YYHBPwJfQdJhZdqM2" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "abdq0A8NBPDJ5IGHROO0JV", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "Label-001", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 46 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 54 + }, + { + "__id__": 56 + } + ], + "_prefab": { + "__id__": 58 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 137.911, + "y": 0.59, + "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__": 53 + }, + "_enabled": true, + "__prefab": { + "__id__": 55 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 133.349609375, "height": 63 }, "_anchorPoint": { @@ -1295,11 +1432,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 47 + "__id__": 53 }, "_enabled": true, "__prefab": { - "__id__": 51 + "__id__": 57 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1370,22 +1507,72 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "ICON_AlienAvarta", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 46 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 60 + }, + { + "__id__": 62 + } + ], + "_prefab": { + "__id__": 64 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 9.548, + "y": 4.297, + "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__": 46 + "__id__": 59 }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 61 }, "_contentSize": { "__type__": "cc.Size", - "width": 54, - "height": 65 + "width": 64.4, + "height": 65.6 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1396,7 +1583,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "f2O4JkkBFOi5e44TtBuvAG" + "fileId": "3e9tkl5HhHAod2gtZIqe+b" }, { "__type__": "cc.Sprite", @@ -1404,11 +1591,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 46 + "__id__": 59 }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 63 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1426,7 +1613,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -1441,7 +1628,48 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b6IDBmxVdMHKDw+MCgNOaA" + "fileId": "acRDzt50FGJYxbJwgQEC2n" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "9auWyqag9AHb2xmt36ortz", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 46 + }, + "_enabled": true, + "__prefab": { + "__id__": 66 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 54, + "height": 65 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f2O4JkkBFOi5e44TtBuvAG" }, { "__type__": "cc.PrefabInfo", @@ -1468,17 +1696,17 @@ "_active": true, "_components": [ { - "__id__": 59 + "__id__": 69 }, { - "__id__": 61 + "__id__": 71 }, { - "__id__": 63 + "__id__": 73 } ], "_prefab": { - "__id__": 65 + "__id__": 75 }, "_lpos": { "__type__": "cc.Vec3", @@ -1515,11 +1743,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 58 + "__id__": 68 }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 70 }, "_contentSize": { "__type__": "cc.Size", @@ -1543,11 +1771,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 58 + "__id__": 68 }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 72 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1565,7 +1793,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -1588,11 +1816,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 58 + "__id__": 68 }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 74 }, "clickEvents": [], "_interactable": true, @@ -1661,7 +1889,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 67 + "__id__": 77 }, "_contentSize": { "__type__": "cc.Size", @@ -1689,7 +1917,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 69 + "__id__": 79 }, "_alignFlags": 45, "_target": null, @@ -1725,10 +1953,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 71 + "__id__": 81 }, "closeBtn": { - "__id__": 63 + "__id__": 73 }, "replayBtn": { "__id__": 29 @@ -1737,7 +1965,7 @@ "__id__": 43 }, "remainLabel": { - "__id__": 50 + "__id__": 56 }, "_id": "" }, @@ -1757,4 +1985,4 @@ "instance": null, "targetOverrides": null } -] +] \ No newline at end of file diff --git a/assets/resources/ui/MainPanel.prefab b/assets/resources/ui/MainPanel.prefab index 0810f80..ed1f227 100644 --- a/assets/resources/ui/MainPanel.prefab +++ b/assets/resources/ui/MainPanel.prefab @@ -27,18 +27,18 @@ ], "_active": true, "_components": [ - { - "__id__": 274 - }, - { - "__id__": 276 - }, { "__id__": 278 + }, + { + "__id__": 280 + }, + { + "__id__": 282 } ], "_prefab": { - "__id__": 280 + "__id__": 284 }, "_lpos": { "__type__": "cc.Vec3", @@ -173,7 +173,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "91f8d9d0-9fa3-4671-8483-96b24934f255@f9941", + "__uuid__": "e50ce6ea-1fcb-4273-a961-3c6ad1b3c8d3@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -272,35 +272,35 @@ "__id__": 77 }, { - "__id__": 141 + "__id__": 143 }, { - "__id__": 151 + "__id__": 153 }, { - "__id__": 161 + "__id__": 163 }, { - "__id__": 183 + "__id__": 185 }, { - "__id__": 263 + "__id__": 267 } ], "_active": true, "_components": [ - { - "__id__": 267 - }, - { - "__id__": 269 - }, { "__id__": 271 + }, + { + "__id__": 273 + }, + { + "__id__": 275 } ], "_prefab": { - "__id__": 273 + "__id__": 277 }, "_lpos": { "__type__": "cc.Vec3", @@ -440,7 +440,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -609,7 +609,7 @@ "_string": "Find the Aliens", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 200, + "_actualFontSize": 142, "_fontSize": 200, "_fontFamily": "Arial", "_lineHeight": 200, @@ -1195,7 +1195,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -1341,7 +1341,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -344.494, + "y": 9.889, "z": 0 }, "_lrot": { @@ -1420,7 +1420,7 @@ "_string": "Desert Eagle", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 40, + "_actualFontSize": 29, "_fontSize": 40, "_fontFamily": "Arial", "_lineHeight": 40, @@ -1639,7 +1639,7 @@ "_string": "Clear Save Data", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 40, + "_actualFontSize": 24, "_fontSize": 40, "_fontFamily": "Arial", "_lineHeight": 40, @@ -1900,23 +1900,23 @@ "__id__": 78 }, { - "__id__": 110 + "__id__": 112 }, { - "__id__": 128 + "__id__": 130 } ], "_active": true, "_components": [ { - "__id__": 136 + "__id__": 138 }, { - "__id__": 138 + "__id__": 140 } ], "_prefab": { - "__id__": 140 + "__id__": 142 }, "_lpos": { "__type__": "cc.Vec3", @@ -1971,18 +1971,18 @@ ], "_active": true, "_components": [ - { - "__id__": 103 - }, { "__id__": 105 }, { "__id__": 107 + }, + { + "__id__": 109 } ], "_prefab": { - "__id__": 109 + "__id__": 111 }, "_lpos": { "__type__": "cc.Vec3", @@ -2372,7 +2372,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 100, + "width": 80.56640625, "height": 75.6 }, "_anchorPoint": { @@ -2483,16 +2483,19 @@ }, { "__id__": 100 + }, + { + "__id__": 102 } ], "_prefab": { - "__id__": 102 + "__id__": 104 }, "_lpos": { "__type__": "cc.Vec3", - "x": 101.322, - "y": 24.302, - "z": 0 + "x": 108.25799999999998, + "y": 0, + "z": 7.225 }, "_lrot": { "__type__": "cc.Quat", @@ -2503,9 +2506,9 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 + "x": 0.438, + "y": 0.438, + "z": 0.597 }, "_mobility": 0, "_layer": 33554432, @@ -2531,8 +2534,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 70.3984375, - "height": 138 + "width": 184, + "height": 185 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2546,7 +2549,7 @@ "fileId": "34fYRqDiFHMYZzDbrU5eEF" }, { - "__type__": "cc.Label", + "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, "__editorExtras__": {}, @@ -2567,51 +2570,66 @@ "b": 255, "a": 255 }, - "_string": "+", - "_horizontalAlign": 1, - "_verticalAlign": 1, - "_actualFontSize": 100, - "_fontSize": 100, - "_fontFamily": "Arial", - "_lineHeight": 100, - "_overflow": 0, - "_enableWrapText": true, - "_font": null, - "_isSystemFontUsed": true, - "_spacingX": 0, - "_isItalic": false, - "_isBold": false, - "_isUnderline": false, - "_underlineHeight": 2, - "_cacheMode": 0, - "_enableOutline": true, - "_outlineColor": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 + "_spriteFrame": { + "__uuid__": "df9ed47d-4c94-4043-9541-f8a800a09501@f9941", + "__expectedType__": "cc.SpriteFrame" }, - "_outlineWidth": 6, - "_enableShadow": false, - "_shadowColor": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_shadowOffset": { + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { "__type__": "cc.Vec2", - "x": 2, - "y": 2 + "x": 0, + "y": 0 }, - "_shadowBlur": 2, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "fa3LqXmSpCJo61bJXy90qK" + "fileId": "deQjFkoxZNV4zzsW0XLeAO" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 97 + }, + "_enabled": true, + "__prefab": { + "__id__": 103 + }, + "_alignFlags": 34, + "_target": { + "__id__": 78 + }, + "_left": 0, + "_right": -41.18399999999998, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "b0jBXacKNI2ZqOhY3rbPYQ" }, { "__type__": "cc.PrefabInfo", @@ -2636,7 +2654,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 106 }, "_contentSize": { "__type__": "cc.Size", @@ -2664,7 +2682,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 106 + "__id__": 108 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2709,7 +2727,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 108 + "__id__": 110 }, "clickEvents": [], "_interactable": true, @@ -2778,23 +2796,23 @@ }, "_children": [ { - "__id__": 111 + "__id__": 113 }, { - "__id__": 117 + "__id__": 119 } ], "_active": true, "_components": [ { - "__id__": 123 + "__id__": 125 }, { - "__id__": 125 + "__id__": 127 } ], "_prefab": { - "__id__": 127 + "__id__": 129 }, "_lpos": { "__type__": "cc.Vec3", @@ -2831,20 +2849,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 110 + "__id__": 112 }, "_children": [], "_active": true, "_components": [ { - "__id__": 112 + "__id__": 114 }, { - "__id__": 114 + "__id__": 116 } ], "_prefab": { - "__id__": 116 + "__id__": 118 }, "_lpos": { "__type__": "cc.Vec3", @@ -2881,11 +2899,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 111 + "__id__": 113 }, "_enabled": true, "__prefab": { - "__id__": 113 + "__id__": 115 }, "_contentSize": { "__type__": "cc.Size", @@ -2909,11 +2927,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 111 + "__id__": 113 }, "_enabled": true, "__prefab": { - "__id__": 115 + "__id__": 117 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2931,7 +2949,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -2967,20 +2985,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 110 + "__id__": 112 }, "_children": [], "_active": true, "_components": [ { - "__id__": 118 + "__id__": 120 }, { - "__id__": 120 + "__id__": 122 } ], "_prefab": { - "__id__": 122 + "__id__": 124 }, "_lpos": { "__type__": "cc.Vec3", @@ -3017,11 +3035,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 117 + "__id__": 119 }, "_enabled": true, "__prefab": { - "__id__": 119 + "__id__": 121 }, "_contentSize": { "__type__": "cc.Size", @@ -3045,11 +3063,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 117 + "__id__": 119 }, "_enabled": true, "__prefab": { - "__id__": 121 + "__id__": 123 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3126,11 +3144,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 110 + "__id__": 112 }, "_enabled": true, "__prefab": { - "__id__": 124 + "__id__": 126 }, "_contentSize": { "__type__": "cc.Size", @@ -3154,11 +3172,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 110 + "__id__": 112 }, "_enabled": true, "__prefab": { - "__id__": 126 + "__id__": 128 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3217,18 +3235,18 @@ "_children": [], "_active": false, "_components": [ - { - "__id__": 129 - }, { "__id__": 131 }, { "__id__": 133 + }, + { + "__id__": 135 } ], "_prefab": { - "__id__": 135 + "__id__": 137 }, "_lpos": { "__type__": "cc.Vec3", @@ -3265,11 +3283,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 128 + "__id__": 130 }, "_enabled": true, "__prefab": { - "__id__": 130 + "__id__": 132 }, "_contentSize": { "__type__": "cc.Size", @@ -3293,11 +3311,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 128 + "__id__": 130 }, "_enabled": true, "__prefab": { - "__id__": 132 + "__id__": 134 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3338,11 +3356,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 128 + "__id__": 130 }, "_enabled": true, "__prefab": { - "__id__": 134 + "__id__": 136 }, "clickEvents": [], "_interactable": true, @@ -3411,7 +3429,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 137 + "__id__": 139 }, "_contentSize": { "__type__": "cc.Size", @@ -3439,7 +3457,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 139 + "__id__": 141 }, "_alignFlags": 17, "_target": null, @@ -3489,9 +3507,6 @@ "_children": [], "_active": false, "_components": [ - { - "__id__": 142 - }, { "__id__": 144 }, @@ -3500,10 +3515,13 @@ }, { "__id__": 148 + }, + { + "__id__": 150 } ], "_prefab": { - "__id__": 150 + "__id__": 152 }, "_lpos": { "__type__": "cc.Vec3", @@ -3540,11 +3558,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 141 + "__id__": 143 }, "_enabled": true, "__prefab": { - "__id__": 143 + "__id__": 145 }, "_contentSize": { "__type__": "cc.Size", @@ -3568,11 +3586,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 141 + "__id__": 143 }, "_enabled": true, "__prefab": { - "__id__": 145 + "__id__": 147 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3613,11 +3631,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 141 + "__id__": 143 }, "_enabled": true, "__prefab": { - "__id__": 147 + "__id__": 149 }, "_alignFlags": 10, "_target": null, @@ -3649,11 +3667,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 141 + "__id__": 143 }, "_enabled": true, "__prefab": { - "__id__": 149 + "__id__": 151 }, "clickEvents": [], "_interactable": true, @@ -3723,9 +3741,6 @@ "_children": [], "_active": false, "_components": [ - { - "__id__": 152 - }, { "__id__": 154 }, @@ -3734,10 +3749,13 @@ }, { "__id__": 158 + }, + { + "__id__": 160 } ], "_prefab": { - "__id__": 160 + "__id__": 162 }, "_lpos": { "__type__": "cc.Vec3", @@ -3774,11 +3792,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 151 + "__id__": 153 }, "_enabled": true, "__prefab": { - "__id__": 153 + "__id__": 155 }, "_contentSize": { "__type__": "cc.Size", @@ -3802,11 +3820,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 151 + "__id__": 153 }, "_enabled": true, "__prefab": { - "__id__": 155 + "__id__": 157 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3847,11 +3865,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 151 + "__id__": 153 }, "_enabled": true, "__prefab": { - "__id__": 157 + "__id__": 159 }, "_alignFlags": 10, "_target": null, @@ -3883,11 +3901,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 151 + "__id__": 153 }, "_enabled": true, "__prefab": { - "__id__": 159 + "__id__": 161 }, "clickEvents": [], "_interactable": true, @@ -3956,17 +3974,14 @@ }, "_children": [ { - "__id__": 162 + "__id__": 164 }, { - "__id__": 168 + "__id__": 170 } ], "_active": true, "_components": [ - { - "__id__": 174 - }, { "__id__": 176 }, @@ -3975,15 +3990,18 @@ }, { "__id__": 180 + }, + { + "__id__": 182 } ], "_prefab": { - "__id__": 182 + "__id__": 184 }, "_lpos": { "__type__": "cc.Vec3", - "x": 407.5, - "y": 50, + "x": 418.739, + "y": 92.709, "z": 0 }, "_lrot": { @@ -4015,25 +4033,25 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 161 + "__id__": 163 }, "_children": [], "_active": true, "_components": [ { - "__id__": 163 + "__id__": 165 }, { - "__id__": 165 + "__id__": 167 } ], "_prefab": { - "__id__": 167 + "__id__": 169 }, "_lpos": { "__type__": "cc.Vec3", - "x": -34.143, - "y": -34.411, + "x": -7.169, + "y": -58.388, "z": 0 }, "_lrot": { @@ -4045,9 +4063,9 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 + "x": 2.192, + "y": 2.192, + "z": 2.192 }, "_mobility": 0, "_layer": 33554432, @@ -4065,16 +4083,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 162 + "__id__": 164 }, "_enabled": true, "__prefab": { - "__id__": 164 + "__id__": 166 }, "_contentSize": { "__type__": "cc.Size", "width": 62, - "height": 36 + "height": 44.5 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -4093,11 +4111,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 162 + "__id__": 164 }, "_enabled": true, "__prefab": { - "__id__": 166 + "__id__": 168 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4110,7 +4128,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "191f70f4-09e8-467c-a50a-e566a0b6b823@f9941", + "__uuid__": "90dc6943-6ff7-4508-8685-05dca0dcb256@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -4151,20 +4169,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 161 + "__id__": 163 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { - "__id__": 169 + "__id__": 171 }, { - "__id__": 171 + "__id__": 173 } ], "_prefab": { - "__id__": 173 + "__id__": 175 }, "_lpos": { "__type__": "cc.Vec3", @@ -4201,11 +4219,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 168 + "__id__": 170 }, "_enabled": true, "__prefab": { - "__id__": 170 + "__id__": 172 }, "_contentSize": { "__type__": "cc.Size", @@ -4229,11 +4247,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 168 + "__id__": 170 }, "_enabled": true, "__prefab": { - "__id__": 172 + "__id__": 174 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4310,11 +4328,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 161 + "__id__": 163 }, "_enabled": true, "__prefab": { - "__id__": 175 + "__id__": 177 }, "_contentSize": { "__type__": "cc.Size", @@ -4338,11 +4356,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 161 + "__id__": 163 }, "_enabled": true, "__prefab": { - "__id__": 177 + "__id__": 179 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4360,7 +4378,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -4383,11 +4401,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 161 + "__id__": 163 }, "_enabled": true, "__prefab": { - "__id__": 179 + "__id__": 181 }, "clickEvents": [], "_interactable": true, @@ -4426,7 +4444,9 @@ "_disabledSprite": null, "_duration": 0.1, "_zoomScale": 1.2, - "_target": null, + "_target": { + "__id__": 163 + }, "_id": "" }, { @@ -4439,20 +4459,20 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 161 + "__id__": 163 }, "_enabled": true, "__prefab": { - "__id__": 181 + "__id__": 183 }, "_alignFlags": 34, "_target": null, "_left": 0, - "_right": 50, + "_right": 38.761000000000024, "_top": 0, "_bottom": 0, "_horizontalCenter": 0, - "_verticalCenter": 50, + "_verticalCenter": 92.709, "_isAbsLeft": true, "_isAbsRight": true, "_isAbsTop": true, @@ -4492,35 +4512,35 @@ }, "_children": [ { - "__id__": 184 + "__id__": 186 }, { - "__id__": 204 + "__id__": 206 }, { - "__id__": 214 + "__id__": 216 }, { - "__id__": 224 + "__id__": 226 }, { - "__id__": 232 + "__id__": 234 }, { - "__id__": 238 + "__id__": 240 } ], "_active": true, "_components": [ { - "__id__": 258 + "__id__": 262 }, { - "__id__": 260 + "__id__": 264 } ], "_prefab": { - "__id__": 262 + "__id__": 266 }, "_lpos": { "__type__": "cc.Vec3", @@ -4557,30 +4577,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 183 + "__id__": 185 }, "_children": [ { - "__id__": 185 + "__id__": 187 }, { - "__id__": 191 + "__id__": 193 } ], "_active": true, "_components": [ - { - "__id__": 197 - }, { "__id__": 199 }, { "__id__": 201 + }, + { + "__id__": 203 } ], "_prefab": { - "__id__": 203 + "__id__": 205 }, "_lpos": { "__type__": "cc.Vec3", @@ -4617,20 +4637,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 184 + "__id__": 186 }, "_children": [], "_active": true, "_components": [ { - "__id__": 186 + "__id__": 188 }, { - "__id__": 188 + "__id__": 190 } ], "_prefab": { - "__id__": 190 + "__id__": 192 }, "_lpos": { "__type__": "cc.Vec3", @@ -4667,11 +4687,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 185 + "__id__": 187 }, "_enabled": true, "__prefab": { - "__id__": 187 + "__id__": 189 }, "_contentSize": { "__type__": "cc.Size", @@ -4695,11 +4715,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 185 + "__id__": 187 }, "_enabled": true, "__prefab": { - "__id__": 189 + "__id__": 191 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4717,7 +4737,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -4753,20 +4773,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 184 + "__id__": 186 }, "_children": [], "_active": true, "_components": [ { - "__id__": 192 + "__id__": 194 }, { - "__id__": 194 + "__id__": 196 } ], "_prefab": { - "__id__": 196 + "__id__": 198 }, "_lpos": { "__type__": "cc.Vec3", @@ -4803,11 +4823,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 191 + "__id__": 193 }, "_enabled": true, "__prefab": { - "__id__": 193 + "__id__": 195 }, "_contentSize": { "__type__": "cc.Size", @@ -4831,11 +4851,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 191 + "__id__": 193 }, "_enabled": true, "__prefab": { - "__id__": 195 + "__id__": 197 }, "_resizeMode": 0, "_layoutType": 1, @@ -4882,11 +4902,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 184 + "__id__": 186 }, "_enabled": true, "__prefab": { - "__id__": 198 + "__id__": 200 }, "_contentSize": { "__type__": "cc.Size", @@ -4910,11 +4930,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 184 + "__id__": 186 }, "_enabled": true, "__prefab": { - "__id__": 200 + "__id__": 202 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4955,11 +4975,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 184 + "__id__": 186 }, "_enabled": true, "__prefab": { - "__id__": 202 + "__id__": 204 }, "_type": 3, "_inverted": false, @@ -4990,14 +5010,11 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 183 + "__id__": 185 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 205 - }, { "__id__": 207 }, @@ -5006,10 +5023,13 @@ }, { "__id__": 211 + }, + { + "__id__": 213 } ], "_prefab": { - "__id__": 213 + "__id__": 215 }, "_lpos": { "__type__": "cc.Vec3", @@ -5046,11 +5066,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 204 + "__id__": 206 }, "_enabled": true, "__prefab": { - "__id__": 206 + "__id__": 208 }, "_contentSize": { "__type__": "cc.Size", @@ -5074,11 +5094,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 204 + "__id__": 206 }, "_enabled": true, "__prefab": { - "__id__": 208 + "__id__": 210 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5096,7 +5116,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -5119,11 +5139,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 204 + "__id__": 206 }, "_enabled": true, "__prefab": { - "__id__": 210 + "__id__": 212 }, "_alignFlags": 8, "_target": null, @@ -5155,11 +5175,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 204 + "__id__": 206 }, "_enabled": true, "__prefab": { - "__id__": 212 + "__id__": 214 }, "clickEvents": [], "_interactable": true, @@ -5224,14 +5244,11 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 183 + "__id__": 185 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 215 - }, { "__id__": 217 }, @@ -5240,10 +5257,13 @@ }, { "__id__": 221 + }, + { + "__id__": 223 } ], "_prefab": { - "__id__": 223 + "__id__": 225 }, "_lpos": { "__type__": "cc.Vec3", @@ -5280,11 +5300,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 214 + "__id__": 216 }, "_enabled": true, "__prefab": { - "__id__": 216 + "__id__": 218 }, "_contentSize": { "__type__": "cc.Size", @@ -5308,11 +5328,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 214 + "__id__": 216 }, "_enabled": true, "__prefab": { - "__id__": 218 + "__id__": 220 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5330,7 +5350,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -5353,11 +5373,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 214 + "__id__": 216 }, "_enabled": true, "__prefab": { - "__id__": 220 + "__id__": 222 }, "_alignFlags": 32, "_target": null, @@ -5389,11 +5409,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 214 + "__id__": 216 }, "_enabled": true, "__prefab": { - "__id__": 222 + "__id__": 224 }, "clickEvents": [], "_interactable": true, @@ -5458,28 +5478,28 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 183 + "__id__": 185 }, "_children": [], - "_active": true, + "_active": false, "_components": [ - { - "__id__": 225 - }, { "__id__": 227 }, { "__id__": 229 + }, + { + "__id__": 231 } ], "_prefab": { - "__id__": 231 + "__id__": 233 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -241.777, + "y": -162.243, "z": 0 }, "_lrot": { @@ -5511,16 +5531,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 224 + "__id__": 226 }, "_enabled": true, "__prefab": { - "__id__": 226 + "__id__": 228 }, "_contentSize": { "__type__": "cc.Size", - "width": 182, - "height": 82 + "width": 300, + "height": 100 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -5539,11 +5559,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 224 + "__id__": 226 }, "_enabled": true, "__prefab": { - "__id__": 228 + "__id__": 230 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5584,11 +5604,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 224 + "__id__": 226 }, "_enabled": true, "__prefab": { - "__id__": 230 + "__id__": 232 }, "clickEvents": [], "_interactable": true, @@ -5628,7 +5648,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 224 + "__id__": 226 }, "_id": "" }, @@ -5655,25 +5675,25 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 183 + "__id__": 185 }, "_children": [], "_active": true, "_components": [ { - "__id__": 233 + "__id__": 235 }, { - "__id__": 235 + "__id__": 237 } ], "_prefab": { - "__id__": 237 + "__id__": 239 }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, - "y": -238.452, + "x": -4.663, + "y": -217.205, "z": 0 }, "_lrot": { @@ -5705,16 +5725,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 232 + "__id__": 234 }, "_enabled": true, "__prefab": { - "__id__": 234 + "__id__": 236 }, "_contentSize": { "__type__": "cc.Size", - "width": 178.5, - "height": 84.5 + "width": 300, + "height": 100 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -5733,23 +5753,23 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 232 + "__id__": 234 }, "_enabled": true, "__prefab": { - "__id__": 236 + "__id__": 238 }, "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, + "r": 0, + "g": 0, + "b": 0, "a": 255 }, - "_string": "Equipped", + "_string": "Equiped", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 50, @@ -5814,35 +5834,35 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 183 + "__id__": 185 }, "_children": [ { - "__id__": 239 + "__id__": 241 }, { - "__id__": 245 + "__id__": 249 } ], "_active": true, "_components": [ - { - "__id__": 251 - }, - { - "__id__": 253 - }, { "__id__": 255 + }, + { + "__id__": 257 + }, + { + "__id__": 259 } ], "_prefab": { - "__id__": 257 + "__id__": 261 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -241.777, + "y": -162.243, "z": 0 }, "_lrot": { @@ -5874,25 +5894,28 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 238 + "__id__": 240 }, "_children": [], "_active": true, "_components": [ { - "__id__": 240 + "__id__": 242 }, { - "__id__": 242 + "__id__": 244 + }, + { + "__id__": 246 } ], "_prefab": { - "__id__": 244 + "__id__": 248 }, "_lpos": { "__type__": "cc.Vec3", - "x": 24.765, - "y": 2.158, + "x": 27.416, + "y": -16.119, "z": 0 }, "_lrot": { @@ -5924,11 +5947,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 239 + "__id__": 241 }, "_enabled": true, "__prefab": { - "__id__": 241 + "__id__": 243 }, "_contentSize": { "__type__": "cc.Size", @@ -5952,11 +5975,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 239 + "__id__": 241 }, "_enabled": true, "__prefab": { - "__id__": 243 + "__id__": 245 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6014,6 +6037,44 @@ "__type__": "cc.CompPrefabInfo", "fileId": "abC/qSyVhKg6WtL/Ysku5g" }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 241 + }, + "_enabled": true, + "__prefab": { + "__id__": 247 + }, + "_alignFlags": 20, + "_target": { + "__id__": 240 + }, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": -8.369, + "_horizontalCenter": 27.416, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "55BKfRsgVEyLsYtFOVg1Wu" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -6033,20 +6094,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 238 + "__id__": 240 }, "_children": [], "_active": false, "_components": [ { - "__id__": 246 + "__id__": 250 }, { - "__id__": 248 + "__id__": 252 } ], "_prefab": { - "__id__": 250 + "__id__": 254 }, "_lpos": { "__type__": "cc.Vec3", @@ -6083,11 +6144,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 245 + "__id__": 249 }, "_enabled": true, "__prefab": { - "__id__": 247 + "__id__": 251 }, "_contentSize": { "__type__": "cc.Size", @@ -6111,11 +6172,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 245 + "__id__": 249 }, "_enabled": true, "__prefab": { - "__id__": 249 + "__id__": 253 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6133,7 +6194,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -6169,15 +6230,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 238 + "__id__": 240 }, "_enabled": true, "__prefab": { - "__id__": 252 + "__id__": 256 }, "_contentSize": { "__type__": "cc.Size", - "width": 200, + "width": 300, "height": 100 }, "_anchorPoint": { @@ -6197,11 +6258,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 238 + "__id__": 240 }, "_enabled": true, "__prefab": { - "__id__": 254 + "__id__": 258 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6242,11 +6303,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 238 + "__id__": 240 }, "_enabled": true, "__prefab": { - "__id__": 256 + "__id__": 260 }, "clickEvents": [], "_interactable": true, @@ -6286,7 +6347,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 238 + "__id__": 240 }, "_id": "" }, @@ -6313,11 +6374,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 183 + "__id__": 185 }, "_enabled": true, "__prefab": { - "__id__": 259 + "__id__": 263 }, "_contentSize": { "__type__": "cc.Size", @@ -6341,11 +6402,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 183 + "__id__": 185 }, "_enabled": true, "__prefab": { - "__id__": 261 + "__id__": 265 }, "_alignFlags": 4, "_target": null, @@ -6396,11 +6457,11 @@ "_active": true, "_components": [ { - "__id__": 264 + "__id__": 268 } ], "_prefab": { - "__id__": 266 + "__id__": 270 }, "_lpos": { "__type__": "cc.Vec3", @@ -6437,11 +6498,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 263 + "__id__": 267 }, "_enabled": true, "__prefab": { - "__id__": 265 + "__id__": 269 }, "_contentSize": { "__type__": "cc.Size", @@ -6482,7 +6543,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 268 + "__id__": 272 }, "_contentSize": { "__type__": "cc.Size", @@ -6510,7 +6571,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 270 + "__id__": 274 }, "_alignFlags": 45, "_target": null, @@ -6546,7 +6607,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 272 + "__id__": 276 }, "_id": "" }, @@ -6577,7 +6638,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 275 + "__id__": 279 }, "_contentSize": { "__type__": "cc.Size", @@ -6605,7 +6666,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 277 + "__id__": 281 }, "_alignFlags": 45, "_target": null, @@ -6641,37 +6702,37 @@ }, "_enabled": true, "__prefab": { - "__id__": 279 + "__id__": 283 }, "startBtn": { "__id__": 52 }, "leftBtn": { - "__id__": 211 + "__id__": 213 }, "right": { - "__id__": 221 + "__id__": 223 }, "equip": { - "__id__": 229 + "__id__": 231 }, "clear": { "__id__": 74 }, "addMoneyBtn": { - "__id__": 178 + "__id__": 180 }, "buy": { - "__id__": 255 + "__id__": 259 }, "equiped": { - "__id__": 232 + "__id__": 234 }, "weaponName": { "__id__": 58 }, "gunPrice": { - "__id__": 242 + "__id__": 244 }, "heart": { "__id__": 88 @@ -6680,10 +6741,10 @@ "__id__": 94 }, "coin": { - "__id__": 120 + "__id__": 122 }, "addHeartBtn": { - "__id__": 107 + "__id__": 109 }, "weaponSelectPrefab": { "__uuid__": "cbdadf26-9f4a-4191-80c0-208a836d2253", @@ -6694,13 +6755,13 @@ "__expectedType__": "cc.Prefab" }, "flyMoneyContent": { - "__id__": 263 + "__id__": 267 }, "fingerNode": { "__id__": 38 }, "weaponContent": { - "__id__": 191 + "__id__": 193 }, "_id": "" }, @@ -6725,4 +6786,4 @@ } ] } -] +] \ No newline at end of file diff --git a/assets/resources/ui/PlayPanel.prefab b/assets/resources/ui/PlayPanel.prefab index 7a9e48c..e21df6e 100644 --- a/assets/resources/ui/PlayPanel.prefab +++ b/assets/resources/ui/PlayPanel.prefab @@ -25,17 +25,17 @@ "_active": true, "_components": [ { - "__id__": 311 + "__id__": 319 }, { - "__id__": 313 + "__id__": 321 }, { - "__id__": 315 + "__id__": 323 } ], "_prefab": { - "__id__": 317 + "__id__": 325 }, "_lpos": { "__type__": "cc.Vec3", @@ -124,26 +124,29 @@ "__id__": 260 }, { - "__id__": 280 + "__id__": 268 }, { - "__id__": 290 + "__id__": 288 + }, + { + "__id__": 298 } ], "_active": true, "_components": [ { - "__id__": 304 + "__id__": 312 }, { - "__id__": 306 + "__id__": 314 }, { - "__id__": 308 + "__id__": 316 } ], "_prefab": { - "__id__": 310 + "__id__": 318 }, "_lpos": { "__type__": "cc.Vec3", @@ -771,7 +774,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -1507,7 +1510,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -3442,7 +3445,7 @@ "_string": "Tap to Aim", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 50, + "_actualFontSize": 44, "_fontSize": 50, "_fontFamily": "Arial", "_lineHeight": 50, @@ -4217,7 +4220,7 @@ "_string": "Tap anywhere to cancel", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 50, + "_actualFontSize": 48, "_fontSize": 50, "_fontFamily": "Arial", "_lineHeight": 50, @@ -4342,8 +4345,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -390, - "y": -471.663, + "x": -390.88, + "y": -472.843, "z": 0 }, "_lrot": { @@ -4355,9 +4358,9 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 + "x": 0.905, + "y": 0.905, + "z": 0.905 }, "_mobility": 0, "_layer": 33554432, @@ -4581,10 +4584,10 @@ }, "_alignFlags": 12, "_target": null, - "_left": 40, + "_left": 49.56999999999999, "_right": 0, "_top": 0, - "_bottom": 340.837, + "_bottom": 353.66949999999997, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -5439,7 +5442,7 @@ }, { "__type__": "cc.Node", - "_name": "TitleLabel", + "_name": "bule-bg", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -5461,6 +5464,181 @@ "_prefab": { "__id__": 259 }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 871.935, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 0.412, + "y": 0.412, + "z": 0.32 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 252 + }, + "_enabled": true, + "__prefab": { + "__id__": 254 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 814, + "height": 215 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c5xLHN4zNN4pNqsKVpCjWD" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 252 + }, + "_enabled": true, + "__prefab": { + "__id__": 256 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "148fb523-e849-4e06-8fdf-37fb123b570c@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": "02NIf/861FzL4WQ3C1OnKR" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 252 + }, + "_enabled": true, + "__prefab": { + "__id__": 258 + }, + "_alignFlags": 17, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 43.77500000000009, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "07zpmNRdtAPLHEXfVMSxUz" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "b0rwG5hcFEt7q5smaF+FyJ", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "TitleLabel", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 261 + }, + { + "__id__": 263 + }, + { + "__id__": 265 + } + ], + "_prefab": { + "__id__": 267 + }, "_lpos": { "__type__": "cc.Vec3", "x": 0, @@ -5496,11 +5674,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 252 + "__id__": 260 }, "_enabled": true, "__prefab": { - "__id__": 254 + "__id__": 262 }, "_contentSize": { "__type__": "cc.Size", @@ -5524,11 +5702,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 252 + "__id__": 260 }, "_enabled": true, "__prefab": { - "__id__": 256 + "__id__": 264 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5543,7 +5721,7 @@ "_string": "Level 1", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 40, + "_actualFontSize": 37, "_fontSize": 40, "_fontFamily": "Arial", "_lineHeight": 40, @@ -5592,11 +5770,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 252 + "__id__": 260 }, "_enabled": true, "__prefab": { - "__id__": 258 + "__id__": 266 }, "_alignFlags": 17, "_target": null, @@ -5631,8 +5809,6 @@ "__id__": 0 }, "fileId": "3coDqttrNCZp5UKo/cRvPm", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -5645,26 +5821,26 @@ }, "_children": [ { - "__id__": 261 + "__id__": 269 }, { - "__id__": 267 + "__id__": 275 } ], "_active": true, "_components": [ { - "__id__": 273 + "__id__": 281 }, { - "__id__": 275 + "__id__": 283 }, { - "__id__": 277 + "__id__": 285 } ], "_prefab": { - "__id__": 279 + "__id__": 287 }, "_lpos": { "__type__": "cc.Vec3", @@ -5701,20 +5877,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 260 + "__id__": 268 }, "_children": [], "_active": true, "_components": [ { - "__id__": 262 + "__id__": 270 }, { - "__id__": 264 + "__id__": 272 } ], "_prefab": { - "__id__": 266 + "__id__": 274 }, "_lpos": { "__type__": "cc.Vec3", @@ -5751,11 +5927,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 261 + "__id__": 269 }, "_enabled": true, "__prefab": { - "__id__": 263 + "__id__": 271 }, "_contentSize": { "__type__": "cc.Size", @@ -5779,11 +5955,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 261 + "__id__": 269 }, "_enabled": true, "__prefab": { - "__id__": 265 + "__id__": 273 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5801,7 +5977,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -5837,20 +6013,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 260 + "__id__": 268 }, "_children": [], "_active": true, "_components": [ { - "__id__": 268 + "__id__": 276 }, { - "__id__": 270 + "__id__": 278 } ], "_prefab": { - "__id__": 272 + "__id__": 280 }, "_lpos": { "__type__": "cc.Vec3", @@ -5887,11 +6063,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 267 + "__id__": 275 }, "_enabled": true, "__prefab": { - "__id__": 269 + "__id__": 277 }, "_contentSize": { "__type__": "cc.Size", @@ -5915,11 +6091,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 267 + "__id__": 275 }, "_enabled": true, "__prefab": { - "__id__": 271 + "__id__": 279 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5996,11 +6172,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 260 + "__id__": 268 }, "_enabled": true, "__prefab": { - "__id__": 274 + "__id__": 282 }, "_contentSize": { "__type__": "cc.Size", @@ -6024,11 +6200,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 260 + "__id__": 268 }, "_enabled": true, "__prefab": { - "__id__": 276 + "__id__": 284 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6069,11 +6245,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 260 + "__id__": 268 }, "_enabled": true, "__prefab": { - "__id__": 278 + "__id__": 286 }, "_alignFlags": 17, "_target": null, @@ -6124,20 +6300,20 @@ "_active": true, "_components": [ { - "__id__": 281 + "__id__": 289 }, { - "__id__": 283 + "__id__": 291 }, { - "__id__": 285 + "__id__": 293 }, { - "__id__": 287 + "__id__": 295 } ], "_prefab": { - "__id__": 289 + "__id__": 297 }, "_lpos": { "__type__": "cc.Vec3", @@ -6174,11 +6350,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 280 + "__id__": 288 }, "_enabled": true, "__prefab": { - "__id__": 282 + "__id__": 290 }, "_contentSize": { "__type__": "cc.Size", @@ -6202,11 +6378,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 280 + "__id__": 288 }, "_enabled": true, "__prefab": { - "__id__": 284 + "__id__": 292 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6224,7 +6400,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -6247,11 +6423,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 280 + "__id__": 288 }, "_enabled": true, "__prefab": { - "__id__": 286 + "__id__": 294 }, "_alignFlags": 9, "_target": null, @@ -6283,11 +6459,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 280 + "__id__": 288 }, "_enabled": true, "__prefab": { - "__id__": 288 + "__id__": 296 }, "clickEvents": [], "_interactable": true, @@ -6356,23 +6532,23 @@ }, "_children": [ { - "__id__": 291 + "__id__": 299 } ], "_active": true, "_components": [ { - "__id__": 297 + "__id__": 305 }, { - "__id__": 299 + "__id__": 307 }, { - "__id__": 301 + "__id__": 309 } ], "_prefab": { - "__id__": 303 + "__id__": 311 }, "_lpos": { "__type__": "cc.Vec3", @@ -6409,20 +6585,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 290 + "__id__": 298 }, "_children": [], "_active": true, "_components": [ { - "__id__": 292 + "__id__": 300 }, { - "__id__": 294 + "__id__": 302 } ], "_prefab": { - "__id__": 296 + "__id__": 304 }, "_lpos": { "__type__": "cc.Vec3", @@ -6459,15 +6635,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 291 + "__id__": 299 }, "_enabled": true, "__prefab": { - "__id__": 293 + "__id__": 301 }, "_contentSize": { "__type__": "cc.Size", - "width": 600, + "width": 580.6884765625, "height": 75.6 }, "_anchorPoint": { @@ -6487,11 +6663,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 291 + "__id__": 299 }, "_enabled": true, "__prefab": { - "__id__": 295 + "__id__": 303 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6568,11 +6744,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 290 + "__id__": 298 }, "_enabled": true, "__prefab": { - "__id__": 298 + "__id__": 306 }, "_contentSize": { "__type__": "cc.Size", @@ -6596,11 +6772,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 290 + "__id__": 298 }, "_enabled": true, "__prefab": { - "__id__": 300 + "__id__": 308 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6641,11 +6817,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 290 + "__id__": 298 }, "_enabled": true, "__prefab": { - "__id__": 302 + "__id__": 310 }, "_alignFlags": 1, "_target": null, @@ -6694,7 +6870,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 305 + "__id__": 313 }, "_contentSize": { "__type__": "cc.Size", @@ -6722,7 +6898,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 307 + "__id__": 315 }, "_alignFlags": 45, "_target": null, @@ -6758,7 +6934,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 309 + "__id__": 317 }, "_id": "" }, @@ -6789,7 +6965,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 312 + "__id__": 320 }, "_contentSize": { "__type__": "cc.Size", @@ -6817,7 +6993,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 314 + "__id__": 322 }, "_alignFlags": 45, "_target": null, @@ -6853,7 +7029,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 316 + "__id__": 324 }, "moveNode": { "__id__": 3 @@ -6884,16 +7060,16 @@ "__id__": 212 }, "timerLabel": { - "__id__": 270 + "__id__": 278 }, "saoMiao": { "__id__": 241 }, "setting": { - "__id__": 287 + "__id__": 295 }, "levelIndexLabel": { - "__id__": 255 + "__id__": 263 }, "fire": { "__id__": 171 @@ -6909,10 +7085,10 @@ }, "alienAnim": null, "tutorialLabel": { - "__id__": 294 + "__id__": 302 }, "tutorialLabelNode": { - "__id__": 290 + "__id__": 298 }, "targetNode": { "__id__": 9 @@ -6958,10 +7134,10 @@ "instance": null, "targetOverrides": [ { - "__id__": 318 + "__id__": 326 }, { - "__id__": 320 + "__id__": 328 } ], "nestedPrefabInstanceRoots": [ @@ -6990,7 +7166,7 @@ "__id__": 176 }, "targetInfo": { - "__id__": 319 + "__id__": 327 } }, { @@ -7002,7 +7178,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 315 + "__id__": 323 }, "sourceInfo": null, "propertyPath": [ @@ -7012,7 +7188,7 @@ "__id__": 31 }, "targetInfo": { - "__id__": 321 + "__id__": 329 } }, { @@ -7021,4 +7197,4 @@ "5bU6q1YxVOZYqFnc16PcJS" ] } -] +] \ No newline at end of file diff --git a/assets/resources/ui/SettingPanel.prefab b/assets/resources/ui/SettingPanel.prefab index b657d84..6b25fee 100644 --- a/assets/resources/ui/SettingPanel.prefab +++ b/assets/resources/ui/SettingPanel.prefab @@ -411,7 +411,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 391.083, - "y": 268.845, + "y": 226.25, "z": 0 }, "_lrot": { @@ -743,7 +743,7 @@ "_target": null, "_left": 0, "_right": -45.08300000000003, - "_top": -19.86700000000002, + "_top": 119.75000000000003, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -772,8 +772,6 @@ "__id__": 0 }, "fileId": "f88yRIPZ5FgLqV1EX/joMg", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -785,7 +783,7 @@ "__id__": 12 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 30 @@ -803,7 +801,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 253.97100000000006, + "y": 350.99300000000005, "z": 0 }, "_lrot": { @@ -970,8 +968,6 @@ "__id__": 0 }, "fileId": "fbZkWTr9VK44YQ3XGCIKtS", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -1051,8 +1047,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -117.05799999999999, - "y": 0, + "x": -224.617, + "y": -89.975, "z": 0 }, "_lrot": { @@ -1160,8 +1156,6 @@ "__id__": 0 }, "fileId": "c5kezD89lFJpH6YyTOX3jT", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -1193,8 +1187,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 70.98400000000004, - "y": 0, + "x": 198.099, + "y": -89.975, "z": 0 }, "_lrot": { @@ -1506,8 +1500,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -117.05799999999999, - "y": 0, + "x": -224.617, + "y": -89.975, "z": 0 }, "_lrot": { @@ -1615,8 +1609,6 @@ "__id__": 0 }, "fileId": "45Drq68FFBob66z/GbehmI", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -1648,8 +1640,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 70.98400000000004, - "y": 0, + "x": 198.099, + "y": -89.975, "z": 0 }, "_lrot": { @@ -1914,7 +1906,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 150, - "y": -428.50000000000006, + "y": -403.4, "z": 0 }, "_lrot": { @@ -1954,8 +1946,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 158, - "height": 133 + "width": 150, + "height": 150 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1996,7 +1988,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -2029,7 +2021,7 @@ "_target": null, "_left": 0, "_right": 0, - "_top": 664.9780000000001, + "_top": 728.4, "_bottom": 0, "_horizontalCenter": 150, "_verticalCenter": 0, @@ -2150,7 +2142,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": -150, - "y": -424.348, + "y": -399.24800000000005, "z": 0 }, "_lrot": { @@ -2190,8 +2182,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 121, - "height": 131 + "width": 150, + "height": 150 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2232,7 +2224,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -2265,7 +2257,7 @@ "_target": null, "_left": 0, "_right": 0, - "_top": 661.826, + "_top": 724.248, "_bottom": 0, "_horizontalCenter": -150, "_verticalCenter": 0, @@ -2371,7 +2363,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 800, - "height": 605.956 + "height": 800 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2407,7 +2399,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "04e49877-13d1-4bec-b1fc-8a85a978a779@f9941", + "__uuid__": "6fc21102-49f7-45af-b0ae-ac8427e0a348@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -2474,8 +2466,6 @@ "__id__": 0 }, "fileId": "79PQ9HbKlHMa3qZuOCkrW0", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { diff --git a/assets/resources/ui/WeaponSelectItem.prefab b/assets/resources/ui/WeaponSelectItem.prefab index 72e0609..68f4051 100644 --- a/assets/resources/ui/WeaponSelectItem.prefab +++ b/assets/resources/ui/WeaponSelectItem.prefab @@ -72,7 +72,7 @@ "__id__": 1 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 3 @@ -166,7 +166,7 @@ "_string": "Desert Eagle", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 60, + "_actualFontSize": 42, "_fontSize": 60, "_fontFamily": "Arial", "_lineHeight": 60, @@ -328,7 +328,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -398,4 +398,4 @@ "instance": null, "targetOverrides": null } -] +] \ No newline at end of file diff --git a/assets/resources/ui/WinPanel.prefab b/assets/resources/ui/WinPanel.prefab index bc32785..3b67d44 100644 --- a/assets/resources/ui/WinPanel.prefab +++ b/assets/resources/ui/WinPanel.prefab @@ -461,7 +461,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -597,7 +597,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -924,8 +924,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 38.195, - "y": 137.262, + "x": 42.966, + "y": 58.184, "z": 0 }, "_lrot": { @@ -965,7 +965,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 66.246094, + "width": 26.24609375, "height": 256 }, "_anchorPoint": { @@ -1083,8 +1083,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 38.195, - "y": 259.762, + "x": 45.355, + "y": 190.192, "z": 0 }, "_lrot": { @@ -1124,7 +1124,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 88.4921875, + "width": 70.73828125, "height": 256 }, "_anchorPoint": { @@ -5362,7 +5362,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -5513,8 +5513,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 31.657, - "y": 0, + "x": 29.318, + "y": -13.797, "z": 0 }, "_lrot": { @@ -5663,7 +5663,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 207, + "width": 250, "height": 93 }, "_anchorPoint": { @@ -5705,7 +5705,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -5874,8 +5874,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 43.398, - "y": -11.504, + "x": 73.943, + "y": -23.179, "z": 0 }, "_lrot": { @@ -6149,7 +6149,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 298, + "width": 350, "height": 155 }, "_anchorPoint": { @@ -6257,7 +6257,9 @@ "_disabledSprite": null, "_duration": 0.1, "_zoomScale": 1.2, - "_target": null, + "_target": { + "__id__": 232 + }, "_id": "" }, { @@ -6273,8 +6275,6 @@ "__id__": 0 }, "fileId": "bbQS0ofeVP/J2oZsECMQWm", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -6443,7 +6443,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -7098,4 +7098,4 @@ } ] } -] +] \ No newline at end of file diff --git a/assets/resources/weaponSprite/WEP_98k.png b/assets/resources/weaponSprite/WEP_98k.png index 73419d8..fcba360 100644 Binary files a/assets/resources/weaponSprite/WEP_98k.png and b/assets/resources/weaponSprite/WEP_98k.png differ diff --git a/assets/resources/weaponSprite/WEP_98k.png.meta b/assets/resources/weaponSprite/WEP_98k.png.meta index a934dc7..fdf043e 100644 --- a/assets/resources/weaponSprite/WEP_98k.png.meta +++ b/assets/resources/weaponSprite/WEP_98k.png.meta @@ -42,13 +42,13 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": 0, + "offsetX": 0.5, "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 663, - "height": 123, - "rawWidth": 663, + "trimX": 4, + "trimY": 31, + "width": 288, + "height": 61, + "rawWidth": 295, "rawHeight": 123, "borderTop": 0, "borderBottom": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -331.5, - -61.5, + -144, + -30.5, 0, - 331.5, - -61.5, + 144, + -30.5, 0, - -331.5, - 61.5, + -144, + 30.5, 0, - 331.5, - 61.5, + 144, + 30.5, 0 ], "indexes": [ @@ -83,33 +83,33 @@ 3 ], "uv": [ - 0, - 123, - 663, - 123, - 0, - 0, - 663, - 0 + 4, + 92, + 292, + 92, + 4, + 31, + 292, + 31 ], "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 + 0.013559322033898305, + 0.25203252032520324, + 0.9898305084745763, + 0.25203252032520324, + 0.013559322033898305, + 0.7479674796747967, + 0.9898305084745763, + 0.7479674796747967 ], "minPos": [ - -331.5, - -61.5, + -144, + -30.5, 0 ], "maxPos": [ - 331.5, - 61.5, + 144, + 30.5, 0 ] }, diff --git a/assets/resources/weaponSprite/WEP_HandGun.png b/assets/resources/weaponSprite/WEP_HandGun.png index 94ab9b4..6f775e1 100644 Binary files a/assets/resources/weaponSprite/WEP_HandGun.png and b/assets/resources/weaponSprite/WEP_HandGun.png differ diff --git a/assets/resources/weaponSprite/WEP_HandGun.png.meta b/assets/resources/weaponSprite/WEP_HandGun.png.meta index f5c497e..f966bd7 100644 --- a/assets/resources/weaponSprite/WEP_HandGun.png.meta +++ b/assets/resources/weaponSprite/WEP_HandGun.png.meta @@ -42,13 +42,13 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 391, - "height": 271, - "rawWidth": 391, + "offsetX": 0.5, + "offsetY": 3.5, + "trimX": 18, + "trimY": 21, + "width": 316, + "height": 222, + "rawWidth": 351, "rawHeight": 271, "borderTop": 0, "borderBottom": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -195.5, - -135.5, + -158, + -111, 0, - 195.5, - -135.5, + 158, + -111, 0, - -195.5, - 135.5, + -158, + 111, 0, - 195.5, - 135.5, + 158, + 111, 0 ], "indexes": [ @@ -83,33 +83,33 @@ 3 ], "uv": [ - 0, - 271, - 391, - 271, - 0, - 0, - 391, - 0 + 18, + 250, + 334, + 250, + 18, + 28, + 334, + 28 ], "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 + 0.05128205128205128, + 0.1033210332103321, + 0.9515669515669516, + 0.1033210332103321, + 0.05128205128205128, + 0.922509225092251, + 0.9515669515669516, + 0.922509225092251 ], "minPos": [ - -195.5, - -135.5, + -158, + -111, 0 ], "maxPos": [ - 195.5, - 135.5, + 158, + 111, 0 ] }, diff --git a/assets/resources/weaponSprite/WEP_M4A1 copy.png b/assets/resources/weaponSprite/WEP_M4A1 copy.png index e23e055..86dbc74 100644 Binary files a/assets/resources/weaponSprite/WEP_M4A1 copy.png and b/assets/resources/weaponSprite/WEP_M4A1 copy.png differ diff --git a/assets/resources/weaponSprite/WEP_M4A1 copy.png.meta b/assets/resources/weaponSprite/WEP_M4A1 copy.png.meta index 529bcec..fed6b6d 100644 --- a/assets/resources/weaponSprite/WEP_M4A1 copy.png.meta +++ b/assets/resources/weaponSprite/WEP_M4A1 copy.png.meta @@ -42,13 +42,13 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 681, - "height": 239, - "rawWidth": 681, + "offsetX": -4, + "offsetY": -9, + "trimX": 11, + "trimY": 49, + "width": 446, + "height": 159, + "rawWidth": 476, "rawHeight": 239, "borderTop": 0, "borderBottom": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -340.5, - -119.5, + -223, + -79.5, 0, - 340.5, - -119.5, + 223, + -79.5, 0, - -340.5, - 119.5, + -223, + 79.5, 0, - 340.5, - 119.5, + 223, + 79.5, 0 ], "indexes": [ @@ -83,33 +83,33 @@ 3 ], "uv": [ - 0, - 239, - 681, - 239, - 0, - 0, - 681, - 0 + 11, + 190, + 457, + 190, + 11, + 31, + 457, + 31 ], "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 + 0.023109243697478993, + 0.1297071129707113, + 0.9600840336134454, + 0.1297071129707113, + 0.023109243697478993, + 0.7949790794979079, + 0.9600840336134454, + 0.7949790794979079 ], "minPos": [ - -340.5, - -119.5, + -223, + -79.5, 0 ], "maxPos": [ - 340.5, - 119.5, + 223, + 79.5, 0 ] }, diff --git a/assets/resources/weaponSprite/WEP_Rifle_2.png b/assets/resources/weaponSprite/WEP_Rifle_2.png index 531185f..5f2d088 100644 Binary files a/assets/resources/weaponSprite/WEP_Rifle_2.png and b/assets/resources/weaponSprite/WEP_Rifle_2.png differ diff --git a/assets/resources/weaponSprite/WEP_Rifle_2.png.meta b/assets/resources/weaponSprite/WEP_Rifle_2.png.meta index 9dc591d..5bfa9f4 100644 --- a/assets/resources/weaponSprite/WEP_Rifle_2.png.meta +++ b/assets/resources/weaponSprite/WEP_Rifle_2.png.meta @@ -42,13 +42,13 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 600, - "height": 203, - "rawWidth": 600, + "offsetX": 1, + "offsetY": -2, + "trimX": 7, + "trimY": 33, + "width": 422, + "height": 141, + "rawWidth": 434, "rawHeight": 203, "borderTop": 0, "borderBottom": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -300, - -101.5, + -211, + -70.5, 0, - 300, - -101.5, + 211, + -70.5, 0, - -300, - 101.5, + -211, + 70.5, 0, - 300, - 101.5, + 211, + 70.5, 0 ], "indexes": [ @@ -83,33 +83,33 @@ 3 ], "uv": [ - 0, - 203, - 600, - 203, - 0, - 0, - 600, - 0 + 7, + 170, + 429, + 170, + 7, + 29, + 429, + 29 ], "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 + 0.016129032258064516, + 0.14285714285714285, + 0.988479262672811, + 0.14285714285714285, + 0.016129032258064516, + 0.8374384236453202, + 0.988479262672811, + 0.8374384236453202 ], "minPos": [ - -300, - -101.5, + -211, + -70.5, 0 ], "maxPos": [ - 300, - 101.5, + 211, + 70.5, 0 ] }, diff --git a/assets/resources/weaponSprite/WEP_Rifle_3.png b/assets/resources/weaponSprite/WEP_Rifle_3.png index a168a6d..52a5896 100644 Binary files a/assets/resources/weaponSprite/WEP_Rifle_3.png and b/assets/resources/weaponSprite/WEP_Rifle_3.png differ diff --git a/assets/resources/weaponSprite/WEP_Rifle_3.png.meta b/assets/resources/weaponSprite/WEP_Rifle_3.png.meta index 63c6ec0..34b6aa8 100644 --- a/assets/resources/weaponSprite/WEP_Rifle_3.png.meta +++ b/assets/resources/weaponSprite/WEP_Rifle_3.png.meta @@ -42,13 +42,13 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 649, - "height": 175, - "rawWidth": 649, + "offsetX": -3, + "offsetY": 3.5, + "trimX": 8, + "trimY": 24, + "width": 474, + "height": 120, + "rawWidth": 496, "rawHeight": 175, "borderTop": 0, "borderBottom": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -324.5, - -87.5, + -237, + -60, 0, - 324.5, - -87.5, + 237, + -60, 0, - -324.5, - 87.5, + -237, + 60, 0, - 324.5, - 87.5, + 237, + 60, 0 ], "indexes": [ @@ -83,33 +83,33 @@ 3 ], "uv": [ - 0, - 175, - 649, - 175, - 0, - 0, - 649, - 0 + 8, + 151, + 482, + 151, + 8, + 31, + 482, + 31 ], "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 + 0.016129032258064516, + 0.17714285714285713, + 0.9717741935483871, + 0.17714285714285713, + 0.016129032258064516, + 0.8628571428571429, + 0.9717741935483871, + 0.8628571428571429 ], "minPos": [ - -324.5, - -87.5, + -237, + -60, 0 ], "maxPos": [ - 324.5, - 87.5, + 237, + 60, 0 ] }, diff --git a/assets/resources/weaponSprite/WEP_Rifle_4.png b/assets/resources/weaponSprite/WEP_Rifle_4.png index c0a3f98..e3731e7 100644 Binary files a/assets/resources/weaponSprite/WEP_Rifle_4.png and b/assets/resources/weaponSprite/WEP_Rifle_4.png differ diff --git a/assets/resources/weaponSprite/WEP_Rifle_4.png.meta b/assets/resources/weaponSprite/WEP_Rifle_4.png.meta index 76c49f9..e1686ba 100644 --- a/assets/resources/weaponSprite/WEP_Rifle_4.png.meta +++ b/assets/resources/weaponSprite/WEP_Rifle_4.png.meta @@ -42,14 +42,14 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, + "offsetX": 5, + "offsetY": 11.5, + "trimX": 27, "trimY": 0, - "width": 487, - "height": 245, + "width": 443, + "height": 169, "rawWidth": 487, - "rawHeight": 245, + "rawHeight": 192, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -243.5, - -122.5, + -221.5, + -84.5, 0, - 243.5, - -122.5, + 221.5, + -84.5, 0, - -243.5, - 122.5, + -221.5, + 84.5, 0, - 243.5, - 122.5, + 221.5, + 84.5, 0 ], "indexes": [ @@ -83,33 +83,33 @@ 3 ], "uv": [ - 0, - 245, - 487, - 245, - 0, - 0, - 487, - 0 + 27, + 192, + 470, + 192, + 27, + 23, + 470, + 23 ], "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, + 0.055441478439425054, + 0.11979166666666667, + 0.9650924024640657, + 0.11979166666666667, + 0.055441478439425054, 1, + 0.9650924024640657, 1 ], "minPos": [ - -243.5, - -122.5, + -221.5, + -84.5, 0 ], "maxPos": [ - 243.5, - 122.5, + 221.5, + 84.5, 0 ] }, diff --git a/assets/resources/weaponSprite/WEP_Sniper_1.png b/assets/resources/weaponSprite/WEP_Sniper_1.png index 5b7e9a6..2ca59cd 100644 Binary files a/assets/resources/weaponSprite/WEP_Sniper_1.png and b/assets/resources/weaponSprite/WEP_Sniper_1.png differ diff --git a/assets/resources/weaponSprite/WEP_Sniper_1.png.meta b/assets/resources/weaponSprite/WEP_Sniper_1.png.meta index 743f717..6daeae2 100644 --- a/assets/resources/weaponSprite/WEP_Sniper_1.png.meta +++ b/assets/resources/weaponSprite/WEP_Sniper_1.png.meta @@ -42,13 +42,13 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 717, - "height": 176, - "rawWidth": 717, + "offsetX": 0.5, + "offsetY": 15, + "trimX": 7, + "trimY": 21, + "width": 440, + "height": 104, + "rawWidth": 453, "rawHeight": 176, "borderTop": 0, "borderBottom": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -358.5, - -88, + -220, + -52, 0, - 358.5, - -88, + 220, + -52, 0, - -358.5, - 88, + -220, + 52, 0, - 358.5, - 88, + 220, + 52, 0 ], "indexes": [ @@ -83,33 +83,33 @@ 3 ], "uv": [ - 0, - 176, - 717, - 176, - 0, - 0, - 717, - 0 + 7, + 155, + 447, + 155, + 7, + 51, + 447, + 51 ], "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 + 0.01545253863134658, + 0.2897727272727273, + 0.9867549668874173, + 0.2897727272727273, + 0.01545253863134658, + 0.8806818181818182, + 0.9867549668874173, + 0.8806818181818182 ], "minPos": [ - -358.5, - -88, + -220, + -52, 0 ], "maxPos": [ - 358.5, - 88, + 220, + 52, 0 ] }, diff --git a/assets/resources/weaponSprite/WEP_Sniper_AWP.png b/assets/resources/weaponSprite/WEP_Sniper_AWP.png index ee9335e..1df7847 100644 Binary files a/assets/resources/weaponSprite/WEP_Sniper_AWP.png and b/assets/resources/weaponSprite/WEP_Sniper_AWP.png differ diff --git a/assets/resources/weaponSprite/WEP_Sniper_AWP.png.meta b/assets/resources/weaponSprite/WEP_Sniper_AWP.png.meta index da15bbc..0d80612 100644 --- a/assets/resources/weaponSprite/WEP_Sniper_AWP.png.meta +++ b/assets/resources/weaponSprite/WEP_Sniper_AWP.png.meta @@ -43,12 +43,12 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 748, - "height": 187, - "rawWidth": 748, + "offsetY": 11.5, + "trimX": 4, + "trimY": 31, + "width": 400, + "height": 102, + "rawWidth": 408, "rawHeight": 187, "borderTop": 0, "borderBottom": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -374, - -93.5, + -200, + -51, 0, - 374, - -93.5, + 200, + -51, 0, - -374, - 93.5, + -200, + 51, 0, - 374, - 93.5, + 200, + 51, 0 ], "indexes": [ @@ -83,33 +83,33 @@ 3 ], "uv": [ - 0, - 187, - 748, - 187, - 0, - 0, - 748, - 0 + 4, + 156, + 404, + 156, + 4, + 54, + 404, + 54 ], "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 + 0.00980392156862745, + 0.2887700534759358, + 0.9901960784313726, + 0.2887700534759358, + 0.00980392156862745, + 0.8342245989304813, + 0.9901960784313726, + 0.8342245989304813 ], "minPos": [ - -374, - -93.5, + -200, + -51, 0 ], "maxPos": [ - 374, - 93.5, + 200, + 51, 0 ] }, diff --git a/profiles/v2/packages/reference-image.json b/profiles/v2/packages/reference-image.json index 470954c..58b59cc 100644 --- a/profiles/v2/packages/reference-image.json +++ b/profiles/v2/packages/reference-image.json @@ -3,6 +3,6 @@ "config": { "images": [], "sceneUUID": {}, - "scene": "cce78068-e13a-47f5-ae44-d1ac5c097bd7" + "scene": "5d346a4f-f822-476d-98b9-f3d235915cca" } } diff --git a/profiles/v2/packages/scene.json b/profiles/v2/packages/scene.json index d409f5e..41d8340 100644 --- a/profiles/v2/packages/scene.json +++ b/profiles/v2/packages/scene.json @@ -37,381 +37,6 @@ "snapThreshold": 4 }, "camera-infos": { - "a5fbc1e5-8fef-4008-af99-7b5c05a60493": { - "position": { - "x": -10.236408371302126, - "y": 35.58104898456512, - "z": 48.51803357348871 - }, - "rotation": { - "x": 0.03235739762831719, - "y": -0.008107963569899571, - "z": 0.000262496306250811, - "w": 0.9994434405413652 - }, - "viewCenter": { - "x": -9.76287237163235, - "y": 37.47295181464095, - "z": 19.3343000148942 - }, - "contentRect": { - "x": 0, - "y": 0, - "width": 1278, - "height": 1036 - }, - "scale": 1 - }, - "d9cae171-550d-466d-87be-469a56396e03": { - "position": { - "x": 27.817017860785924, - "y": 27.81701786078592, - "z": 27.81701786078592 - }, - "rotation": { - "x": -0.27984814233312133, - "y": 0.3647051996310009, - "z": 0.11591689595929512, - "w": 0.8804762392171493 - }, - "viewCenter": { - "x": 0, - "y": 0, - "z": 0 - }, - "contentRect": { - "x": 0, - "y": 0, - "width": 1500, - "height": 1000 - }, - "scale": 1 - }, - "05e95568-be75-4a9f-813c-2a573fea06d7": { - "position": { - "x": 920.3187805891823, - "y": 29.44099722952865, - "z": -640.1815216619977 - }, - "rotation": { - "x": 0.10861124555798167, - "y": 0.140357038882468, - "z": -0.015491962589160352, - "w": 0.9840038099873523 - }, - "viewCenter": { - "x": 911.969, - "y": 36.115, - "z": -668.855 - }, - "contentRect": { - "x": 0, - "y": 0, - "width": 1278, - "height": 1036 - }, - "scale": 1 - }, - "bef31fc9-26df-4878-99f9-b46c2742d1cd": { - "position": { - "x": 3.384628083051723, - "y": 13.862613307961965, - "z": 19.283518336448765 - }, - "rotation": { - "x": -0.30206468729363184, - "y": 0.0826809294998207, - "z": 0.026307998363731367, - "w": 0.9493306472506511 - }, - "viewCenter": { - "x": 0, - "y": 0, - "z": 0 - }, - "contentRect": { - "x": 0, - "y": 0, - "width": 1278, - "height": 1036 - }, - "scale": 1 - }, - "c5016504-6a91-444d-8765-d32e82d8bf75": { - "position": { - "x": 3.384628083309042, - "y": 13.862613309015805, - "z": 19.283518337914693 - }, - "rotation": { - "x": -0.30206468729363184, - "y": 0.0826809294998207, - "z": 0.026307998363731367, - "w": 0.9493306472506511 - }, - "viewCenter": { - "x": 0, - "y": 0, - "z": 0 - }, - "contentRect": { - "x": 0, - "y": 0, - "width": 1278, - "height": 1036 - }, - "scale": 1 - }, - "93a2926b-e8e3-489f-919a-d6a645dc177f": { - "position": { - "x": 3.3846280830685505, - "y": 13.862613308030808, - "z": 19.283518336544518 - }, - "rotation": { - "x": -0.30206468729363184, - "y": 0.0826809294998207, - "z": 0.026307998363731367, - "w": 0.9493306472506511 - }, - "viewCenter": { - "x": 0, - "y": 0, - "z": 0 - }, - "contentRect": { - "x": 0, - "y": 0, - "width": 1278, - "height": 1036 - }, - "scale": 1 - }, - "410bafbb-fed7-4a20-9164-2957f7f16380": { - "position": { - "x": 3.384628083309042, - "y": 13.862613309015805, - "z": 19.283518337914693 - }, - "rotation": { - "x": -0.30206468729363184, - "y": 0.0826809294998207, - "z": 0.026307998363731367, - "w": 0.9493306472506511 - }, - "viewCenter": { - "x": 0, - "y": 0, - "z": 0 - }, - "contentRect": { - "x": 0, - "y": 0, - "width": 1278, - "height": 1036 - }, - "scale": 1 - }, - "647af7af-634a-4c8e-859d-a9b2b3a4c6ff": { - "position": { - "x": 3.3846280830685505, - "y": 13.862613308030808, - "z": 19.283518336544518 - }, - "rotation": { - "x": -0.30206468729363184, - "y": 0.0826809294998207, - "z": 0.026307998363731367, - "w": 0.9493306472506511 - }, - "viewCenter": { - "x": 0, - "y": 0, - "z": 0 - }, - "contentRect": { - "x": 0, - "y": 0, - "width": 1278, - "height": 1036 - }, - "scale": 1 - }, - "bdf4ba5b-464e-4a3e-804b-94ea69952adb": { - "position": { - "x": -368.7044622849017, - "y": 43.65970630503737, - "z": -267.22513637210466 - }, - "rotation": { - "x": -0.30206468729363184, - "y": 0.0826809294998207, - "z": 0.026307998363731367, - "w": 0.9493306472506511 - }, - "viewCenter": { - "x": -373.441, - "y": 24.26, - "z": -294.211 - }, - "contentRect": { - "x": 0, - "y": 0, - "width": 1278, - "height": 1036 - }, - "scale": 1 - }, - "6a2fd2c8-53fd-485a-b753-8d42b516695d": { - "position": { - "x": 436.8897407918445, - "y": 26.99450165580158, - "z": 496.25805120950736 - }, - "rotation": { - "x": 0.10861121712229206, - "y": 0.14035701687833338, - "z": -0.015492161943847895, - "w": 0.9840038131260138 - }, - "viewCenter": { - "x": 428.14900271796995, - "y": 33.98100000000058, - "z": 466.2419992085214 - }, - "contentRect": { - "x": 0, - "y": 0, - "width": 1278, - "height": 1036 - }, - "scale": 1 - }, - "1ea3713d-41d7-4ec2-8657-0edbf06e58d6": { - "position": { - "x": -2.229863329436436, - "y": -0.8662095957568112, - "z": 8.70495013623497 - }, - "rotation": { - "x": 0.2183427400618447, - "y": -0.1224065763376206, - "z": 0.027616240224770428, - "w": 0.9677708516002522 - }, - "viewCenter": { - "x": -0.09007133221481745, - "y": 3.21968128862237, - "z": 0.3814690706947843 - }, - "contentRect": { - "x": 0, - "y": 0, - "width": 1278, - "height": 1036 - }, - "scale": 1 - }, - "4d4a6db4-e603-40dd-8ee7-086cbc66c519": { - "position": { - "x": 5.121906166531663, - "y": 19.377521546791293, - "z": 13.116642347523678 - }, - "rotation": { - "x": 0.10861124555798167, - "y": 0.140357038882468, - "z": -0.015491962589160352, - "w": 0.9840038099873523 - }, - "viewCenter": { - "x": 1.6584424863197018, - "y": 22.145877667083713, - "z": 1.2229704422190153 - }, - "contentRect": { - "x": 0, - "y": 0, - "width": 1278, - "height": 1036 - }, - "scale": 1 - }, - "493975b1-902f-49e9-837c-f684d4483de6": { - "position": { - "x": 1.1263492102849613, - "y": 15.732709735276728, - "z": 8.829283519170799 - }, - "rotation": { - "x": 0.2431929049496173, - "y": -0.008659060190094572, - "z": 0.0021770460124752354, - "w": 0.9699368495574597 - }, - "viewCenter": { - "x": 1.269, - "y": 20.009, - "z": 0.839 - }, - "contentRect": { - "x": 0, - "y": 0, - "width": 1278, - "height": 1036 - }, - "scale": 1 - }, - "f8494fa3-cbb7-479a-b31c-27d7e529b803": { - "position": { - "x": 1.4183747174502928, - "y": 17.414935999339335, - "z": 9.734801508354433 - }, - "rotation": { - "x": 0.2431929049496173, - "y": -0.008659060190094572, - "z": 0.0021770460124752354, - "w": 0.9699368495574597 - }, - "viewCenter": { - "x": 1.5610255071653312, - "y": 21.691226264062607, - "z": 1.7445179891836382 - }, - "contentRect": { - "x": 0, - "y": 0, - "width": 1278, - "height": 1036 - }, - "scale": 1 - }, - "d13b389d-0d8b-49b3-9e0d-5485f92b3b71": { - "position": { - "x": 1.224980067996145, - "y": 18.68939982773385, - "z": 12.36843787200476 - }, - "rotation": { - "x": 0.2431929049496173, - "y": -0.008659060190094572, - "z": 0.0021770460124752354, - "w": 0.9699368495574597 - }, - "viewCenter": { - "x": 1.411650789715046, - "y": 24.285290264723503, - "z": 1.9124705812396297 - }, - "contentRect": { - "x": 0, - "y": 0, - "width": 1278, - "height": 1036 - }, - "scale": 1 - }, "d8e31e2a-1e11-428d-8a17-255d3b2cf6ea": { "position": { "x": 6.545658261810169, @@ -537,31 +162,6 @@ }, "scale": 1 }, - "d9d1ac9a-4991-430b-b914-8bb7f9eb3113": { - "position": { - "x": 0.022383133294741387, - "y": 17.675724569393587, - "z": 9.06233537952625 - }, - "rotation": { - "x": 0.17204359431688335, - "y": -0.10162223689976012, - "z": 0.017848104599174148, - "w": 0.9796710508044185 - }, - "viewCenter": { - "x": 1.6823694091741594, - "y": 20.606677557747922, - "z": 1.1470038217286573 - }, - "contentRect": { - "x": 0, - "y": 0, - "width": 1184, - "height": 1036 - }, - "scale": 1 - }, "52797c1b-d337-480b-8881-798050c5bb5c": { "position": { "x": 1.271960990865912, @@ -1262,17 +862,367 @@ }, "scale": 1 }, - "cce78068-e13a-47f5-ae44-d1ac5c097bd7": { + "d9d1ac9a-4991-430b-b914-8bb7f9eb3113": { "position": { - "x": 947.2, - "y": 1047.9, - "z": 5197.933782010323 + "x": -0.03935235331714074, + "y": 17.566721373643222, + "z": 9.356709406899544 }, "rotation": { + "x": 0.17204359431688335, + "y": -0.10162223689976012, + "z": 0.017848104599174148, + "w": 0.9796710508044185 + }, + "viewCenter": { + "x": 1.6823694091741594, + "y": 20.606677557747922, + "z": 1.1470038217286573 + }, + "contentRect": { "x": 0, "y": 0, - "z": 0, - "w": 1 + "width": 1184, + "height": 979 + }, + "scale": 1 + }, + "1ea3713d-41d7-4ec2-8657-0edbf06e58d6": { + "position": { + "x": 0.5296909063036992, + "y": -0.9640717083059371, + "z": 11.218421092836252 + }, + "rotation": { + "x": 0.14967771870801821, + "y": -0.0017603585426449846, + "z": 0.0002664049100704834, + "w": 0.9887332353514716 + }, + "viewCenter": { + "x": 0.569985663326203, + "y": 2.5424072094088785, + "z": -0.09755336582122887 + }, + "contentRect": { + "x": 0, + "y": 0, + "width": 1184, + "height": 979 + }, + "scale": 1 + }, + "ad272ff9-6d7a-42ea-81f4-6baaad9deba1": { + "position": { + "x": 27.34166824351705, + "y": 27.341668243517045, + "z": 27.341668243517045 + }, + "rotation": { + "x": -0.27984814233312133, + "y": 0.3647051996310009, + "z": 0.11591689595929512, + "w": 0.8804762392171493 + }, + "viewCenter": { + "x": 0, + "y": 0, + "z": 0 + }, + "contentRect": { + "x": 0, + "y": 0, + "width": 1500, + "height": 1000 + }, + "scale": 1 + }, + "b28daaf1-f7f1-4e0e-8ad0-2664116e00cf": { + "position": { + "x": -10.515471506145904, + "y": 20.82264526184729, + "z": 6.959495205701768 + }, + "rotation": { + "x": 0.01816423499659225, + "y": -0.5962505432259572, + "z": 0.013496225096835762, + "w": 0.8024794091924572 + }, + "viewCenter": { + "x": -1.3742695613624605, + "y": 21.255083467753813, + "z": 4.20403621736289 + }, + "contentRect": { + "x": 0, + "y": 0, + "width": 1184, + "height": 979 + }, + "scale": 1 + }, + "d13b389d-0d8b-49b3-9e0d-5485f92b3b71": { + "position": { + "x": 0.1373564509065062, + "y": 21.002839149410676, + "z": 12.969802353039057 + }, + "rotation": { + "x": 0.0236910641098189, + "y": -0.00989511739487504, + "z": 0.0002345031696570995, + "w": 0.9996703282289364 + }, + "viewCenter": { + "x": 0.37187322148985297, + "y": 21.56469389775232, + "z": 1.1247439381231281 + }, + "contentRect": { + "x": 0, + "y": 0, + "width": 1184, + "height": 979 + }, + "scale": 1 + }, + "493975b1-902f-49e9-837c-f684d4483de6": { + "position": { + "x": 8.827140950366758, + "y": 20.758491097485532, + "z": 5.848693638528715 + }, + "rotation": { + "x": 0.08390321077419852, + "y": 0.49016814427886185, + "z": -0.04747502740488784, + "w": 0.8662803029787196 + }, + "viewCenter": { + "x": 0.21502353459129786, + "y": 22.723048755176315, + "z": 0.6750431096864906 + }, + "contentRect": { + "x": 0, + "y": 0, + "width": 1184, + "height": 979 + }, + "scale": 1 + }, + "51fedb3f-cde6-4132-8cdc-c43889554e3d": { + "position": { + "x": 5.706266925281484, + "y": 23.384267830302925, + "z": 5.7872978572246 + }, + "rotation": { + "x": -0.09973263475737824, + "y": 0.2546540629672847, + "z": 0.026413916265837077, + "w": 0.9615128781280607 + }, + "viewCenter": { + "x": 1.3497409808047713, + "y": 21.538542594567694, + "z": -1.8603955034917368 + }, + "contentRect": { + "x": 0, + "y": 0, + "width": 1184, + "height": 979 + }, + "scale": 1 + }, + "f8494fa3-cbb7-479a-b31c-27d7e529b803": { + "position": { + "x": 1.418374717450293, + "y": 17.414935999339335, + "z": 9.734801508354433 + }, + "rotation": { + "x": 0.2431929049496173, + "y": -0.008659060190094572, + "z": 0.0021770460124752354, + "w": 0.9699368495574597 + }, + "viewCenter": { + "x": 1.5610255071653312, + "y": 21.691226264062607, + "z": 1.7445179891836382 + }, + "contentRect": { + "x": 0, + "y": 0, + "width": 1184, + "height": 979 + }, + "scale": 1 + }, + "a9bc11b9-dc05-4097-99dd-136fc0a9bcb6": { + "position": { + "x": 1.1358204067420308, + "y": 16.01663094794967, + "z": 8.298774398899376 + }, + "rotation": { + "x": 0.2431929049496173, + "y": -0.008659060190094572, + "z": 0.0021770460124752354, + "w": 0.9699368495574597 + }, + "viewCenter": { + "x": 1.269, + "y": 20.009, + "z": 0.839 + }, + "contentRect": { + "x": 0, + "y": 0, + "width": 1184, + "height": 979 + }, + "scale": 1 + }, + "4d4a6db4-e603-40dd-8ee7-086cbc66c519": { + "position": { + "x": 5.121906166531663, + "y": 19.377521546791293, + "z": 13.116642347523678 + }, + "rotation": { + "x": 0.10861124555798167, + "y": 0.140357038882468, + "z": -0.015491962589160352, + "w": 0.9840038099873523 + }, + "viewCenter": { + "x": 1.6584424863197018, + "y": 22.145877667083713, + "z": 1.2229704422190153 + }, + "contentRect": { + "x": 0, + "y": 0, + "width": 1184, + "height": 979 + }, + "scale": 1 + }, + "2ad4c146-150c-474c-bfba-cc454f729bd7": { + "position": { + "x": 3.940141585234175, + "y": 17.55599284892215, + "z": 9.444666467738374 + }, + "rotation": { + "x": 0.10861124555798167, + "y": 0.140357038882468, + "z": -0.015491962589160352, + "w": 0.9840038099873523 + }, + "viewCenter": { + "x": 1.3950794253959455, + "y": 19.59026808817675, + "z": 0.7048218778654292 + }, + "contentRect": { + "x": 0, + "y": 0, + "width": 1184, + "height": 979 + }, + "scale": 1 + }, + "ebc079a6-870a-4821-a5e9-4e0aaf3bb65d": { + "position": { + "x": -6.174371836734207, + "y": 20.031769903404218, + "z": 3.375340965254449 + }, + "rotation": { + "x": 0.13101697233002818, + "y": -0.5925695407029659, + "z": 0.09846879123558701, + "w": 0.7886696327012669 + }, + "viewCenter": { + "x": 1.5165546716023082, + "y": 22.768011619975564, + "z": 1.1465268801825514 + }, + "contentRect": { + "x": 0, + "y": 0, + "width": 1184, + "height": 979 + }, + "scale": 1 + }, + "0c97152b-4a33-4289-9367-c16334945bc0": { + "position": { + "x": -6.205603588028538, + "y": 21.596177088912736, + "z": 9.664374571492083 + }, + "rotation": { + "x": 0.00888274967326509, + "y": -0.36742423153554216, + "z": 0.0035094730333861835, + "w": 0.9300044163531933 + }, + "viewCenter": { + "x": 0.7320362039136388, + "y": 21.790097238980064, + "z": 2.2547387700192036 + }, + "contentRect": { + "x": 0, + "y": 0, + "width": 1184, + "height": 979 + }, + "scale": 1 + }, + "cef8f141-5506-41f9-a813-d4c6f929882c": { + "position": { + "x": 12.008971629776394, + "y": 20.61275618775368, + "z": -0.9566488281365205 + }, + "rotation": { + "x": 0.06690663503630655, + "y": 0.9056797309707616, + "z": -0.15632829315835303, + "w": 0.38836734138576007 + }, + "viewCenter": { + "x": 6.233217839804089, + "y": 23.448663096647795, + "z": 4.539102410380591 + }, + "contentRect": { + "x": 0, + "y": 0, + "width": 1184, + "height": 979 + }, + "scale": 1 + }, + "b9347d84-559f-413f-b4b7-89e8502bb298": { + "position": { + "x": 30.6003821146244, + "y": 30.600382114624395, + "z": 30.600382114624395 + }, + "rotation": { + "x": -0.27984814233312133, + "y": 0.3647051996310009, + "z": 0.11591689595929512, + "w": 0.8804762392171493 }, "viewCenter": { "x": 0, @@ -1286,30 +1236,64 @@ "height": 979 }, "scale": 1 + }, + "6e85350a-b58b-4481-a6d9-26bf2f781cdd": { + "position": { + "x": 25.202594965807123, + "y": 25.202594965807116, + "z": 25.202594965807116 + }, + "rotation": { + "x": -0.27984814233312133, + "y": 0.3647051996310009, + "z": 0.11591689595929512, + "w": 0.8804762392171493 + }, + "viewCenter": { + "x": 0, + "y": 0, + "z": 0 + }, + "contentRect": { + "x": 0, + "y": 0, + "width": 1500, + "height": 1000 + }, + "scale": 1 + }, + "cce78068-e13a-47f5-ae44-d1ac5c097bd7": { + "position": { + "x": 14.348778704834523, + "y": 14.348778704834515, + "z": 14.348778704834515 + }, + "rotation": { + "x": 0.17075200576379718, + "y": 0.04719724755400728, + "z": -0.008188826350908503, + "w": 0.984148929519288 + }, + "viewCenter": { + "x": 30.55007695540683, + "y": 39.228978733956815, + "z": 12.059721614925262 + }, + "contentRect": { + "x": 0, + "y": 0, + "width": 1500, + "height": 1000 + }, + "scale": 1 } }, "camera-uuids": [ - "a5fbc1e5-8fef-4008-af99-7b5c05a60493", - "d9cae171-550d-466d-87be-469a56396e03", - "05e95568-be75-4a9f-813c-2a573fea06d7", - "bef31fc9-26df-4878-99f9-b46c2742d1cd", - "c5016504-6a91-444d-8765-d32e82d8bf75", - "93a2926b-e8e3-489f-919a-d6a645dc177f", - "410bafbb-fed7-4a20-9164-2957f7f16380", - "647af7af-634a-4c8e-859d-a9b2b3a4c6ff", - "bdf4ba5b-464e-4a3e-804b-94ea69952adb", - "6a2fd2c8-53fd-485a-b753-8d42b516695d", - "1ea3713d-41d7-4ec2-8657-0edbf06e58d6", - "4d4a6db4-e603-40dd-8ee7-086cbc66c519", - "493975b1-902f-49e9-837c-f684d4483de6", - "f8494fa3-cbb7-479a-b31c-27d7e529b803", - "d13b389d-0d8b-49b3-9e0d-5485f92b3b71", "d8e31e2a-1e11-428d-8a17-255d3b2cf6ea", "60463bf1-d090-4cb7-8a64-61041fc0c378", "93f653e7-15fb-4bb5-8a2b-b8e548543887", "e06517fb-3e1a-4cdd-bde7-f82913a534b9", "bfe4aa9c-90bb-40c9-a4f8-770d36cbf8ad", - "d9d1ac9a-4991-430b-b914-8bb7f9eb3113", "52797c1b-d337-480b-8881-798050c5bb5c", "38749290-df52-49fc-80dc-72574b09b95c", "f102524c-73a2-4c5b-8b1c-63285b7b944e", @@ -1338,6 +1322,22 @@ "034c14f7-5612-47bd-91a1-67407529433f", "cbdadf26-9f4a-4191-80c0-208a836d2253", "e029010b-60d7-4476-934b-1fe2481d7a88", + "d9d1ac9a-4991-430b-b914-8bb7f9eb3113", + "1ea3713d-41d7-4ec2-8657-0edbf06e58d6", + "ad272ff9-6d7a-42ea-81f4-6baaad9deba1", + "b28daaf1-f7f1-4e0e-8ad0-2664116e00cf", + "d13b389d-0d8b-49b3-9e0d-5485f92b3b71", + "493975b1-902f-49e9-837c-f684d4483de6", + "51fedb3f-cde6-4132-8cdc-c43889554e3d", + "f8494fa3-cbb7-479a-b31c-27d7e529b803", + "a9bc11b9-dc05-4097-99dd-136fc0a9bcb6", + "4d4a6db4-e603-40dd-8ee7-086cbc66c519", + "2ad4c146-150c-474c-bfba-cc454f729bd7", + "ebc079a6-870a-4821-a5e9-4e0aaf3bb65d", + "0c97152b-4a33-4289-9367-c16334945bc0", + "cef8f141-5506-41f9-a813-d4c6f929882c", + "b9347d84-559f-413f-b4b7-89e8502bb298", + "6e85350a-b58b-4481-a6d9-26bf2f781cdd", "cce78068-e13a-47f5-ae44-d1ac5c097bd7" ], "camera": { diff --git a/splash-texture/kaiping.jpg b/splash-texture/kaiping.jpg index 4ac7470..7b58f72 100644 Binary files a/splash-texture/kaiping.jpg and b/splash-texture/kaiping.jpg differ