Compare commits
7 Commits
4460c1aaf2
...
card0515
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
50f43c227a | ||
|
|
9c2c0a1621 | ||
|
|
b12270be66 | ||
|
|
d926c08582 | ||
|
|
10ab03b871 | ||
|
|
7dd5257fd8 | ||
|
|
b0d752ab18 |
@@ -12074,7 +12074,7 @@
|
|||||||
},
|
},
|
||||||
"_lpos": {
|
"_lpos": {
|
||||||
"__type__": "cc.Vec3",
|
"__type__": "cc.Vec3",
|
||||||
"x": 459.147,
|
"x": 371.47,
|
||||||
"y": -29.439,
|
"y": -29.439,
|
||||||
"z": 0
|
"z": 0
|
||||||
},
|
},
|
||||||
@@ -21924,7 +21924,7 @@
|
|||||||
},
|
},
|
||||||
"_lpos": {
|
"_lpos": {
|
||||||
"__type__": "cc.Vec3",
|
"__type__": "cc.Vec3",
|
||||||
"x": 459.147,
|
"x": 371.47,
|
||||||
"y": -29.439,
|
"y": -29.439,
|
||||||
"z": 0
|
"z": 0
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -7,11 +7,11 @@
|
|||||||
"embeddedPlayerGroups": []
|
"embeddedPlayerGroups": []
|
||||||
},
|
},
|
||||||
"_native": "",
|
"_native": "",
|
||||||
"sample": 5,
|
"sample": 1,
|
||||||
"speed": 1,
|
"speed": 1,
|
||||||
"wrapMode": 2,
|
"wrapMode": 2,
|
||||||
"enableTrsBlending": false,
|
"enableTrsBlending": false,
|
||||||
"_duration": 6,
|
"_duration": 30,
|
||||||
"_hash": 500763545,
|
"_hash": 500763545,
|
||||||
"_tracks": [
|
"_tracks": [
|
||||||
{
|
{
|
||||||
@@ -77,7 +77,7 @@
|
|||||||
"__type__": "cc.RealCurve",
|
"__type__": "cc.RealCurve",
|
||||||
"_times": [
|
"_times": [
|
||||||
0,
|
0,
|
||||||
6
|
30
|
||||||
],
|
],
|
||||||
"_values": [
|
"_values": [
|
||||||
{
|
{
|
||||||
@@ -90,7 +90,9 @@
|
|||||||
"leftTangent": 0,
|
"leftTangent": 0,
|
||||||
"leftTangentWeight": 1,
|
"leftTangentWeight": 1,
|
||||||
"easingMethod": 0,
|
"easingMethod": 0,
|
||||||
"__editorExtras__": null
|
"__editorExtras__": {
|
||||||
|
"broken": null
|
||||||
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"__type__": "cc.RealKeyframeValue",
|
"__type__": "cc.RealKeyframeValue",
|
||||||
@@ -102,7 +104,9 @@
|
|||||||
"leftTangent": 0,
|
"leftTangent": 0,
|
||||||
"leftTangentWeight": 1,
|
"leftTangentWeight": 1,
|
||||||
"easingMethod": 0,
|
"easingMethod": 0,
|
||||||
"__editorExtras__": null
|
"__editorExtras__": {
|
||||||
|
"broken": null
|
||||||
|
}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"preExtrapolation": 1,
|
"preExtrapolation": 1,
|
||||||
@@ -118,7 +122,7 @@
|
|||||||
"__type__": "cc.RealCurve",
|
"__type__": "cc.RealCurve",
|
||||||
"_times": [
|
"_times": [
|
||||||
0,
|
0,
|
||||||
6
|
30
|
||||||
],
|
],
|
||||||
"_values": [
|
"_values": [
|
||||||
{
|
{
|
||||||
@@ -131,7 +135,9 @@
|
|||||||
"leftTangent": 0,
|
"leftTangent": 0,
|
||||||
"leftTangentWeight": 1,
|
"leftTangentWeight": 1,
|
||||||
"easingMethod": 0,
|
"easingMethod": 0,
|
||||||
"__editorExtras__": null
|
"__editorExtras__": {
|
||||||
|
"broken": null
|
||||||
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"__type__": "cc.RealKeyframeValue",
|
"__type__": "cc.RealKeyframeValue",
|
||||||
@@ -143,7 +149,9 @@
|
|||||||
"leftTangent": 0,
|
"leftTangent": 0,
|
||||||
"leftTangentWeight": 1,
|
"leftTangentWeight": 1,
|
||||||
"easingMethod": 0,
|
"easingMethod": 0,
|
||||||
"__editorExtras__": null
|
"__editorExtras__": {
|
||||||
|
"broken": null
|
||||||
|
}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"preExtrapolation": 1,
|
"preExtrapolation": 1,
|
||||||
@@ -159,7 +167,7 @@
|
|||||||
"__type__": "cc.RealCurve",
|
"__type__": "cc.RealCurve",
|
||||||
"_times": [
|
"_times": [
|
||||||
0,
|
0,
|
||||||
6
|
30
|
||||||
],
|
],
|
||||||
"_values": [
|
"_values": [
|
||||||
{
|
{
|
||||||
@@ -172,7 +180,9 @@
|
|||||||
"leftTangent": 0,
|
"leftTangent": 0,
|
||||||
"leftTangentWeight": 1,
|
"leftTangentWeight": 1,
|
||||||
"easingMethod": 0,
|
"easingMethod": 0,
|
||||||
"__editorExtras__": null
|
"__editorExtras__": {
|
||||||
|
"broken": null
|
||||||
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"__type__": "cc.RealKeyframeValue",
|
"__type__": "cc.RealKeyframeValue",
|
||||||
@@ -184,7 +194,9 @@
|
|||||||
"leftTangent": 0,
|
"leftTangent": 0,
|
||||||
"leftTangentWeight": 1,
|
"leftTangentWeight": 1,
|
||||||
"easingMethod": 0,
|
"easingMethod": 0,
|
||||||
"__editorExtras__": null
|
"__editorExtras__": {
|
||||||
|
"broken": null
|
||||||
|
}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"preExtrapolation": 1,
|
"preExtrapolation": 1,
|
||||||
@@ -251,7 +263,7 @@
|
|||||||
"__type__": "cc.RealCurve",
|
"__type__": "cc.RealCurve",
|
||||||
"_times": [
|
"_times": [
|
||||||
0,
|
0,
|
||||||
6
|
30
|
||||||
],
|
],
|
||||||
"_values": [
|
"_values": [
|
||||||
{
|
{
|
||||||
@@ -264,7 +276,9 @@
|
|||||||
"leftTangent": 0,
|
"leftTangent": 0,
|
||||||
"leftTangentWeight": 1,
|
"leftTangentWeight": 1,
|
||||||
"easingMethod": 0,
|
"easingMethod": 0,
|
||||||
"__editorExtras__": null
|
"__editorExtras__": {
|
||||||
|
"broken": null
|
||||||
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"__type__": "cc.RealKeyframeValue",
|
"__type__": "cc.RealKeyframeValue",
|
||||||
@@ -276,7 +290,9 @@
|
|||||||
"leftTangent": 0,
|
"leftTangent": 0,
|
||||||
"leftTangentWeight": 1,
|
"leftTangentWeight": 1,
|
||||||
"easingMethod": 0,
|
"easingMethod": 0,
|
||||||
"__editorExtras__": null
|
"__editorExtras__": {
|
||||||
|
"broken": null
|
||||||
|
}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"preExtrapolation": 1,
|
"preExtrapolation": 1,
|
||||||
@@ -292,7 +308,7 @@
|
|||||||
"__type__": "cc.RealCurve",
|
"__type__": "cc.RealCurve",
|
||||||
"_times": [
|
"_times": [
|
||||||
0,
|
0,
|
||||||
6
|
30
|
||||||
],
|
],
|
||||||
"_values": [
|
"_values": [
|
||||||
{
|
{
|
||||||
@@ -305,7 +321,9 @@
|
|||||||
"leftTangent": 0,
|
"leftTangent": 0,
|
||||||
"leftTangentWeight": 1,
|
"leftTangentWeight": 1,
|
||||||
"easingMethod": 0,
|
"easingMethod": 0,
|
||||||
"__editorExtras__": null
|
"__editorExtras__": {
|
||||||
|
"broken": null
|
||||||
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"__type__": "cc.RealKeyframeValue",
|
"__type__": "cc.RealKeyframeValue",
|
||||||
@@ -317,7 +335,9 @@
|
|||||||
"leftTangent": 0,
|
"leftTangent": 0,
|
||||||
"leftTangentWeight": 1,
|
"leftTangentWeight": 1,
|
||||||
"easingMethod": 0,
|
"easingMethod": 0,
|
||||||
"__editorExtras__": null
|
"__editorExtras__": {
|
||||||
|
"broken": null
|
||||||
|
}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"preExtrapolation": 1,
|
"preExtrapolation": 1,
|
||||||
@@ -333,7 +353,7 @@
|
|||||||
"__type__": "cc.RealCurve",
|
"__type__": "cc.RealCurve",
|
||||||
"_times": [
|
"_times": [
|
||||||
0,
|
0,
|
||||||
6
|
30
|
||||||
],
|
],
|
||||||
"_values": [
|
"_values": [
|
||||||
{
|
{
|
||||||
@@ -346,7 +366,9 @@
|
|||||||
"leftTangent": 0,
|
"leftTangent": 0,
|
||||||
"leftTangentWeight": 1,
|
"leftTangentWeight": 1,
|
||||||
"easingMethod": 0,
|
"easingMethod": 0,
|
||||||
"__editorExtras__": null
|
"__editorExtras__": {
|
||||||
|
"broken": null
|
||||||
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"__type__": "cc.RealKeyframeValue",
|
"__type__": "cc.RealKeyframeValue",
|
||||||
@@ -358,7 +380,9 @@
|
|||||||
"leftTangent": 0,
|
"leftTangent": 0,
|
||||||
"leftTangentWeight": 1,
|
"leftTangentWeight": 1,
|
||||||
"easingMethod": 0,
|
"easingMethod": 0,
|
||||||
"__editorExtras__": null
|
"__editorExtras__": {
|
||||||
|
"broken": null
|
||||||
|
}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"preExtrapolation": 1,
|
"preExtrapolation": 1,
|
||||||
|
|||||||
@@ -710,10 +710,10 @@
|
|||||||
"_string": "点击开始游戏",
|
"_string": "点击开始游戏",
|
||||||
"_horizontalAlign": 1,
|
"_horizontalAlign": 1,
|
||||||
"_verticalAlign": 1,
|
"_verticalAlign": 1,
|
||||||
"_actualFontSize": 36,
|
"_actualFontSize": 51,
|
||||||
"_fontSize": 35,
|
"_fontSize": 50,
|
||||||
"_fontFamily": "Arial",
|
"_fontFamily": "Arial",
|
||||||
"_lineHeight": 40,
|
"_lineHeight": 50,
|
||||||
"_overflow": 2,
|
"_overflow": 2,
|
||||||
"_enableWrapText": true,
|
"_enableWrapText": true,
|
||||||
"_font": null,
|
"_font": null,
|
||||||
@@ -732,7 +732,7 @@
|
|||||||
"b": 0,
|
"b": 0,
|
||||||
"a": 255
|
"a": 255
|
||||||
},
|
},
|
||||||
"_outlineWidth": 2,
|
"_outlineWidth": 4,
|
||||||
"_enableShadow": false,
|
"_enableShadow": false,
|
||||||
"_shadowColor": {
|
"_shadowColor": {
|
||||||
"__type__": "cc.Color",
|
"__type__": "cc.Color",
|
||||||
|
|||||||
@@ -406,7 +406,7 @@
|
|||||||
"_lpos": {
|
"_lpos": {
|
||||||
"__type__": "cc.Vec3",
|
"__type__": "cc.Vec3",
|
||||||
"x": 0,
|
"x": 0,
|
||||||
"y": 279.527,
|
"y": 418.633,
|
||||||
"z": 0
|
"z": 0
|
||||||
},
|
},
|
||||||
"_lrot": {
|
"_lrot": {
|
||||||
@@ -707,13 +707,13 @@
|
|||||||
"b": 255,
|
"b": 255,
|
||||||
"a": 255
|
"a": 255
|
||||||
},
|
},
|
||||||
"_string": "点击开始游戏",
|
"_string": "选择一个战斗技能",
|
||||||
"_horizontalAlign": 1,
|
"_horizontalAlign": 1,
|
||||||
"_verticalAlign": 1,
|
"_verticalAlign": 1,
|
||||||
"_actualFontSize": 36,
|
"_actualFontSize": 46,
|
||||||
"_fontSize": 35,
|
"_fontSize": 45,
|
||||||
"_fontFamily": "Arial",
|
"_fontFamily": "Arial",
|
||||||
"_lineHeight": 40,
|
"_lineHeight": 50,
|
||||||
"_overflow": 2,
|
"_overflow": 2,
|
||||||
"_enableWrapText": true,
|
"_enableWrapText": true,
|
||||||
"_font": null,
|
"_font": null,
|
||||||
@@ -732,7 +732,7 @@
|
|||||||
"b": 0,
|
"b": 0,
|
||||||
"a": 255
|
"a": 255
|
||||||
},
|
},
|
||||||
"_outlineWidth": 2,
|
"_outlineWidth": 3,
|
||||||
"_enableShadow": false,
|
"_enableShadow": false,
|
||||||
"_shadowColor": {
|
"_shadowColor": {
|
||||||
"__type__": "cc.Color",
|
"__type__": "cc.Color",
|
||||||
@@ -762,8 +762,6 @@
|
|||||||
"__id__": 0
|
"__id__": 0
|
||||||
},
|
},
|
||||||
"fileId": "25KvUjWTBKZq5B20vwtseT",
|
"fileId": "25KvUjWTBKZq5B20vwtseT",
|
||||||
"instance": null,
|
|
||||||
"targetOverrides": null,
|
|
||||||
"nestedPrefabInstanceRoots": null
|
"nestedPrefabInstanceRoots": null
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -1178,14 +1176,14 @@
|
|||||||
"__prefab": {
|
"__prefab": {
|
||||||
"__id__": 49
|
"__id__": 49
|
||||||
},
|
},
|
||||||
"_alignFlags": 40,
|
"_alignFlags": 42,
|
||||||
"_target": null,
|
"_target": null,
|
||||||
"_left": 0,
|
"_left": 0,
|
||||||
"_right": 0,
|
"_right": 0,
|
||||||
"_top": 590,
|
"_top": 590,
|
||||||
"_bottom": 590,
|
"_bottom": 590,
|
||||||
"_horizontalCenter": 0,
|
"_horizontalCenter": 0,
|
||||||
"_verticalCenter": 0,
|
"_verticalCenter": 418.633,
|
||||||
"_isAbsLeft": true,
|
"_isAbsLeft": true,
|
||||||
"_isAbsRight": true,
|
"_isAbsRight": true,
|
||||||
"_isAbsTop": true,
|
"_isAbsTop": true,
|
||||||
|
|||||||
@@ -402,7 +402,7 @@
|
|||||||
"_lpos": {
|
"_lpos": {
|
||||||
"__type__": "cc.Vec3",
|
"__type__": "cc.Vec3",
|
||||||
"x": 0,
|
"x": 0,
|
||||||
"y": 0,
|
"y": 248.35000000000002,
|
||||||
"z": 0
|
"z": 0
|
||||||
},
|
},
|
||||||
"_lrot": {
|
"_lrot": {
|
||||||
@@ -703,13 +703,13 @@
|
|||||||
"b": 255,
|
"b": 255,
|
||||||
"a": 255
|
"a": 255
|
||||||
},
|
},
|
||||||
"_string": "点击开始游戏",
|
"_string": "选中卡牌向上滑动,召唤英雄",
|
||||||
"_horizontalAlign": 1,
|
"_horizontalAlign": 1,
|
||||||
"_verticalAlign": 1,
|
"_verticalAlign": 1,
|
||||||
"_actualFontSize": 36,
|
"_actualFontSize": 41,
|
||||||
"_fontSize": 35,
|
"_fontSize": 40,
|
||||||
"_fontFamily": "Arial",
|
"_fontFamily": "Arial",
|
||||||
"_lineHeight": 40,
|
"_lineHeight": 50,
|
||||||
"_overflow": 2,
|
"_overflow": 2,
|
||||||
"_enableWrapText": true,
|
"_enableWrapText": true,
|
||||||
"_font": null,
|
"_font": null,
|
||||||
@@ -728,7 +728,7 @@
|
|||||||
"b": 0,
|
"b": 0,
|
||||||
"a": 255
|
"a": 255
|
||||||
},
|
},
|
||||||
"_outlineWidth": 2,
|
"_outlineWidth": 4,
|
||||||
"_enableShadow": false,
|
"_enableShadow": false,
|
||||||
"_shadowColor": {
|
"_shadowColor": {
|
||||||
"__type__": "cc.Color",
|
"__type__": "cc.Color",
|
||||||
@@ -1174,12 +1174,12 @@
|
|||||||
"__prefab": {
|
"__prefab": {
|
||||||
"__id__": 49
|
"__id__": 49
|
||||||
},
|
},
|
||||||
"_alignFlags": 40,
|
"_alignFlags": 44,
|
||||||
"_target": null,
|
"_target": null,
|
||||||
"_left": 0,
|
"_left": 0,
|
||||||
"_right": 0,
|
"_right": 0,
|
||||||
"_top": 590,
|
"_top": 590,
|
||||||
"_bottom": 590,
|
"_bottom": 788.35,
|
||||||
"_horizontalCenter": 0,
|
"_horizontalCenter": 0,
|
||||||
"_verticalCenter": 0,
|
"_verticalCenter": 0,
|
||||||
"_isAbsLeft": true,
|
"_isAbsLeft": true,
|
||||||
@@ -1303,7 +1303,6 @@
|
|||||||
"__id__": 0
|
"__id__": 0
|
||||||
},
|
},
|
||||||
"fileId": "6dh4o/8p1Cy5An1p6o4Bc3",
|
"fileId": "6dh4o/8p1Cy5An1p6o4Bc3",
|
||||||
"instance": null,
|
"instance": null
|
||||||
"targetOverrides": null
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@@ -335,12 +335,12 @@
|
|||||||
"__prefab": {
|
"__prefab": {
|
||||||
"__id__": 14
|
"__id__": 14
|
||||||
},
|
},
|
||||||
"_alignFlags": 0,
|
"_alignFlags": 36,
|
||||||
"_target": null,
|
"_target": null,
|
||||||
"_left": 0,
|
"_left": 651.948,
|
||||||
"_right": 0,
|
"_right": 67.05200000000002,
|
||||||
"_top": 0,
|
"_top": 0,
|
||||||
"_bottom": 0,
|
"_bottom": 50.20600000000002,
|
||||||
"_horizontalCenter": 0,
|
"_horizontalCenter": 0,
|
||||||
"_verticalCenter": 0,
|
"_verticalCenter": 0,
|
||||||
"_isAbsLeft": true,
|
"_isAbsLeft": true,
|
||||||
@@ -349,7 +349,7 @@
|
|||||||
"_isAbsBottom": true,
|
"_isAbsBottom": true,
|
||||||
"_isAbsHorizontalCenter": true,
|
"_isAbsHorizontalCenter": true,
|
||||||
"_isAbsVerticalCenter": true,
|
"_isAbsVerticalCenter": true,
|
||||||
"_originalWidth": 0,
|
"_originalWidth": 1,
|
||||||
"_originalHeight": 0,
|
"_originalHeight": 0,
|
||||||
"_alignMode": 2,
|
"_alignMode": 2,
|
||||||
"_lockFlags": 0,
|
"_lockFlags": 0,
|
||||||
@@ -707,13 +707,13 @@
|
|||||||
"b": 255,
|
"b": 255,
|
||||||
"a": 255
|
"a": 255
|
||||||
},
|
},
|
||||||
"_string": "点击开始游戏",
|
"_string": "点击「战斗」进入战斗阶段",
|
||||||
"_horizontalAlign": 1,
|
"_horizontalAlign": 1,
|
||||||
"_verticalAlign": 1,
|
"_verticalAlign": 1,
|
||||||
"_actualFontSize": 36,
|
"_actualFontSize": 41,
|
||||||
"_fontSize": 35,
|
"_fontSize": 40,
|
||||||
"_fontFamily": "Arial",
|
"_fontFamily": "Arial",
|
||||||
"_lineHeight": 40,
|
"_lineHeight": 50,
|
||||||
"_overflow": 2,
|
"_overflow": 2,
|
||||||
"_enableWrapText": true,
|
"_enableWrapText": true,
|
||||||
"_font": null,
|
"_font": null,
|
||||||
@@ -732,7 +732,7 @@
|
|||||||
"b": 0,
|
"b": 0,
|
||||||
"a": 255
|
"a": 255
|
||||||
},
|
},
|
||||||
"_outlineWidth": 2,
|
"_outlineWidth": 4,
|
||||||
"_enableShadow": false,
|
"_enableShadow": false,
|
||||||
"_shadowColor": {
|
"_shadowColor": {
|
||||||
"__type__": "cc.Color",
|
"__type__": "cc.Color",
|
||||||
|
|||||||
@@ -38,10 +38,13 @@
|
|||||||
"_components": [
|
"_components": [
|
||||||
{
|
{
|
||||||
"__id__": 102
|
"__id__": 102
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"__id__": 104
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"_prefab": {
|
"_prefab": {
|
||||||
"__id__": 104
|
"__id__": 106
|
||||||
},
|
},
|
||||||
"_lpos": {
|
"_lpos": {
|
||||||
"__type__": "cc.Vec3",
|
"__type__": "cc.Vec3",
|
||||||
@@ -240,7 +243,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"__type__": "cc.Node",
|
"__type__": "cc.Node",
|
||||||
"_name": "m7",
|
"_name": "h",
|
||||||
"_objFlags": 0,
|
"_objFlags": 0,
|
||||||
"__editorExtras__": {},
|
"__editorExtras__": {},
|
||||||
"_parent": {
|
"_parent": {
|
||||||
@@ -618,7 +621,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"__type__": "cc.Node",
|
"__type__": "cc.Node",
|
||||||
"_name": "a1",
|
"_name": "h",
|
||||||
"_objFlags": 0,
|
"_objFlags": 0,
|
||||||
"__editorExtras__": {},
|
"__editorExtras__": {},
|
||||||
"_parent": {
|
"_parent": {
|
||||||
@@ -996,7 +999,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"__type__": "cc.Node",
|
"__type__": "cc.Node",
|
||||||
"_name": "k1",
|
"_name": "h",
|
||||||
"_objFlags": 0,
|
"_objFlags": 0,
|
||||||
"__editorExtras__": {},
|
"__editorExtras__": {},
|
||||||
"_parent": {
|
"_parent": {
|
||||||
@@ -1208,7 +1211,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"__type__": "cc.Node",
|
"__type__": "cc.Node",
|
||||||
"_name": "hero2",
|
"_name": "hero4",
|
||||||
"_objFlags": 0,
|
"_objFlags": 0,
|
||||||
"__editorExtras__": {},
|
"__editorExtras__": {},
|
||||||
"_parent": {
|
"_parent": {
|
||||||
@@ -1374,7 +1377,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"__type__": "cc.Node",
|
"__type__": "cc.Node",
|
||||||
"_name": "m1",
|
"_name": "h",
|
||||||
"_objFlags": 0,
|
"_objFlags": 0,
|
||||||
"__editorExtras__": {},
|
"__editorExtras__": {},
|
||||||
"_parent": {
|
"_parent": {
|
||||||
@@ -1586,7 +1589,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"__type__": "cc.Node",
|
"__type__": "cc.Node",
|
||||||
"_name": "hero4",
|
"_name": "hero5",
|
||||||
"_objFlags": 0,
|
"_objFlags": 0,
|
||||||
"__editorExtras__": {},
|
"__editorExtras__": {},
|
||||||
"_parent": {
|
"_parent": {
|
||||||
@@ -1752,7 +1755,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"__type__": "cc.Node",
|
"__type__": "cc.Node",
|
||||||
"_name": "h1",
|
"_name": "h",
|
||||||
"_objFlags": 0,
|
"_objFlags": 0,
|
||||||
"__editorExtras__": {},
|
"__editorExtras__": {},
|
||||||
"_parent": {
|
"_parent": {
|
||||||
@@ -1990,6 +1993,39 @@
|
|||||||
"__type__": "cc.CompPrefabInfo",
|
"__type__": "cc.CompPrefabInfo",
|
||||||
"fileId": "f2zvSV135PlYuUfadiV2hO"
|
"fileId": "f2zvSV135PlYuUfadiV2hO"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"__type__": "46ae531x0VGib728jAKeNFe",
|
||||||
|
"_name": "",
|
||||||
|
"_objFlags": 0,
|
||||||
|
"__editorExtras__": {},
|
||||||
|
"node": {
|
||||||
|
"__id__": 1
|
||||||
|
},
|
||||||
|
"_enabled": true,
|
||||||
|
"__prefab": {
|
||||||
|
"__id__": 105
|
||||||
|
},
|
||||||
|
"hero1": {
|
||||||
|
"__id__": 42
|
||||||
|
},
|
||||||
|
"hero2": {
|
||||||
|
"__id__": 62
|
||||||
|
},
|
||||||
|
"hero3": {
|
||||||
|
"__id__": 2
|
||||||
|
},
|
||||||
|
"hero4": {
|
||||||
|
"__id__": 62
|
||||||
|
},
|
||||||
|
"hero5": {
|
||||||
|
"__id__": 82
|
||||||
|
},
|
||||||
|
"_id": ""
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"__type__": "cc.CompPrefabInfo",
|
||||||
|
"fileId": "86bacQ+jZMOokmXQGUf5Ed"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"__type__": "cc.PrefabInfo",
|
"__type__": "cc.PrefabInfo",
|
||||||
"root": {
|
"root": {
|
||||||
|
|||||||
@@ -180,7 +180,7 @@
|
|||||||
},
|
},
|
||||||
"_lpos": {
|
"_lpos": {
|
||||||
"__type__": "cc.Vec3",
|
"__type__": "cc.Vec3",
|
||||||
"x": 0,
|
"x": -259.716,
|
||||||
"y": 0,
|
"y": 0,
|
||||||
"z": 0
|
"z": 0
|
||||||
},
|
},
|
||||||
@@ -271,7 +271,7 @@
|
|||||||
},
|
},
|
||||||
"_contentSize": {
|
"_contentSize": {
|
||||||
"__type__": "cc.Size",
|
"__type__": "cc.Size",
|
||||||
"width": 510,
|
"width": 300,
|
||||||
"height": 66
|
"height": 66
|
||||||
},
|
},
|
||||||
"_anchorPoint": {
|
"_anchorPoint": {
|
||||||
@@ -313,7 +313,7 @@
|
|||||||
},
|
},
|
||||||
"_type": 1,
|
"_type": 1,
|
||||||
"_fillType": 0,
|
"_fillType": 0,
|
||||||
"_sizeMode": 1,
|
"_sizeMode": 0,
|
||||||
"_fillCenter": {
|
"_fillCenter": {
|
||||||
"__type__": "cc.Vec2",
|
"__type__": "cc.Vec2",
|
||||||
"x": 0,
|
"x": 0,
|
||||||
@@ -443,7 +443,7 @@
|
|||||||
"b": 255,
|
"b": 255,
|
||||||
"a": 255
|
"a": 255
|
||||||
},
|
},
|
||||||
"_string": "第 1/20 波",
|
"_string": "第 1 波",
|
||||||
"_horizontalAlign": 1,
|
"_horizontalAlign": 1,
|
||||||
"_verticalAlign": 1,
|
"_verticalAlign": 1,
|
||||||
"_actualFontSize": 26,
|
"_actualFontSize": 26,
|
||||||
@@ -821,8 +821,8 @@
|
|||||||
},
|
},
|
||||||
"_lpos": {
|
"_lpos": {
|
||||||
"__type__": "cc.Vec3",
|
"__type__": "cc.Vec3",
|
||||||
"x": 0,
|
"x": 295.012,
|
||||||
"y": -36.584,
|
"y": 0,
|
||||||
"z": 0
|
"z": 0
|
||||||
},
|
},
|
||||||
"_lrot": {
|
"_lrot": {
|
||||||
@@ -1110,8 +1110,8 @@
|
|||||||
},
|
},
|
||||||
"_contentSize": {
|
"_contentSize": {
|
||||||
"__type__": "cc.Size",
|
"__type__": "cc.Size",
|
||||||
"width": 100,
|
"width": 720,
|
||||||
"height": 100
|
"height": 50
|
||||||
},
|
},
|
||||||
"_anchorPoint": {
|
"_anchorPoint": {
|
||||||
"__type__": "cc.Vec2",
|
"__type__": "cc.Vec2",
|
||||||
@@ -1136,11 +1136,11 @@
|
|||||||
"__prefab": {
|
"__prefab": {
|
||||||
"__id__": 44
|
"__id__": 44
|
||||||
},
|
},
|
||||||
"_alignFlags": 17,
|
"_alignFlags": 41,
|
||||||
"_target": null,
|
"_target": null,
|
||||||
"_left": 0,
|
"_left": 0,
|
||||||
"_right": 0,
|
"_right": 0,
|
||||||
"_top": 39.067999999999984,
|
"_top": 64.06799999999998,
|
||||||
"_bottom": 0,
|
"_bottom": 0,
|
||||||
"_horizontalCenter": 0,
|
"_horizontalCenter": 0,
|
||||||
"_verticalCenter": 0,
|
"_verticalCenter": 0,
|
||||||
@@ -1150,7 +1150,7 @@
|
|||||||
"_isAbsBottom": true,
|
"_isAbsBottom": true,
|
||||||
"_isAbsHorizontalCenter": true,
|
"_isAbsHorizontalCenter": true,
|
||||||
"_isAbsVerticalCenter": true,
|
"_isAbsVerticalCenter": true,
|
||||||
"_originalWidth": 0,
|
"_originalWidth": 100,
|
||||||
"_originalHeight": 0,
|
"_originalHeight": 0,
|
||||||
"_alignMode": 2,
|
"_alignMode": 2,
|
||||||
"_lockFlags": 0,
|
"_lockFlags": 0,
|
||||||
@@ -14302,7 +14302,7 @@
|
|||||||
"_lpos": {
|
"_lpos": {
|
||||||
"__type__": "cc.Vec3",
|
"__type__": "cc.Vec3",
|
||||||
"x": 761.798,
|
"x": 761.798,
|
||||||
"y": 640,
|
"y": 1020,
|
||||||
"z": 0
|
"z": 0
|
||||||
},
|
},
|
||||||
"_lrot": {
|
"_lrot": {
|
||||||
@@ -14903,11 +14903,11 @@
|
|||||||
"__prefab": {
|
"__prefab": {
|
||||||
"__id__": 701
|
"__id__": 701
|
||||||
},
|
},
|
||||||
"_alignFlags": 2,
|
"_alignFlags": 1,
|
||||||
"_target": null,
|
"_target": null,
|
||||||
"_left": 0,
|
"_left": 0,
|
||||||
"_right": 0,
|
"_right": 0,
|
||||||
"_top": 448.34799999999996,
|
"_top": 200,
|
||||||
"_bottom": 0,
|
"_bottom": 0,
|
||||||
"_horizontalCenter": 0,
|
"_horizontalCenter": 0,
|
||||||
"_verticalCenter": 0,
|
"_verticalCenter": 0,
|
||||||
@@ -15377,7 +15377,7 @@
|
|||||||
"propertyPath": [
|
"propertyPath": [
|
||||||
"_active"
|
"_active"
|
||||||
],
|
],
|
||||||
"value": true
|
"value": false
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"__type__": "CCPropertyOverrideInfo",
|
"__type__": "CCPropertyOverrideInfo",
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
BIN
assets/resources/music/BATTLE.mp3
Normal file
BIN
assets/resources/music/BATTLE.mp3
Normal file
Binary file not shown.
@@ -2,10 +2,10 @@
|
|||||||
"ver": "1.0.0",
|
"ver": "1.0.0",
|
||||||
"importer": "audio-clip",
|
"importer": "audio-clip",
|
||||||
"imported": true,
|
"imported": true,
|
||||||
"uuid": "55262788-4684-484b-9273-5af16c12690d",
|
"uuid": "db35468f-265d-4465-86ba-5186c6c1d0a2",
|
||||||
"files": [
|
"files": [
|
||||||
".json",
|
".json",
|
||||||
".wav"
|
".mp3"
|
||||||
],
|
],
|
||||||
"subMetas": {},
|
"subMetas": {},
|
||||||
"userData": {
|
"userData": {
|
||||||
BIN
assets/resources/music/Critical.mp3
Normal file
BIN
assets/resources/music/Critical.mp3
Normal file
Binary file not shown.
@@ -2,10 +2,10 @@
|
|||||||
"ver": "1.0.0",
|
"ver": "1.0.0",
|
||||||
"importer": "audio-clip",
|
"importer": "audio-clip",
|
||||||
"imported": true,
|
"imported": true,
|
||||||
"uuid": "9d34eb17-93b0-4e19-817e-aa289eebf54e",
|
"uuid": "82584d50-d744-4717-bba9-a74cf21c136d",
|
||||||
"files": [
|
"files": [
|
||||||
".json",
|
".json",
|
||||||
".wav"
|
".mp3"
|
||||||
],
|
],
|
||||||
"subMetas": {},
|
"subMetas": {},
|
||||||
"userData": {
|
"userData": {
|
||||||
Binary file not shown.
BIN
assets/resources/music/Fire.mp3
Normal file
BIN
assets/resources/music/Fire.mp3
Normal file
Binary file not shown.
@@ -2,10 +2,10 @@
|
|||||||
"ver": "1.0.0",
|
"ver": "1.0.0",
|
||||||
"importer": "audio-clip",
|
"importer": "audio-clip",
|
||||||
"imported": true,
|
"imported": true,
|
||||||
"uuid": "eab9c19a-d17b-44c1-8182-666328bfd379",
|
"uuid": "b03d05c0-ce55-4f75-b4ef-214d0151a240",
|
||||||
"files": [
|
"files": [
|
||||||
".json",
|
".json",
|
||||||
".wav"
|
".mp3"
|
||||||
],
|
],
|
||||||
"subMetas": {},
|
"subMetas": {},
|
||||||
"userData": {
|
"userData": {
|
||||||
BIN
assets/resources/music/Hit.mp3
Normal file
BIN
assets/resources/music/Hit.mp3
Normal file
Binary file not shown.
@@ -2,10 +2,10 @@
|
|||||||
"ver": "1.0.0",
|
"ver": "1.0.0",
|
||||||
"importer": "audio-clip",
|
"importer": "audio-clip",
|
||||||
"imported": true,
|
"imported": true,
|
||||||
"uuid": "7788bbf2-19b3-4d2b-9b29-73c1a3611bf2",
|
"uuid": "32a28430-53ab-4444-a65a-140412486986",
|
||||||
"files": [
|
"files": [
|
||||||
".json",
|
".json",
|
||||||
".wav"
|
".mp3"
|
||||||
],
|
],
|
||||||
"subMetas": {},
|
"subMetas": {},
|
||||||
"userData": {
|
"userData": {
|
||||||
Binary file not shown.
BIN
assets/resources/music/button.mp3
Normal file
BIN
assets/resources/music/button.mp3
Normal file
Binary file not shown.
14
assets/resources/music/button.mp3.meta
Normal file
14
assets/resources/music/button.mp3.meta
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
{
|
||||||
|
"ver": "1.0.0",
|
||||||
|
"importer": "audio-clip",
|
||||||
|
"imported": true,
|
||||||
|
"uuid": "62669db4-c83b-4438-9a93-150260d92408",
|
||||||
|
"files": [
|
||||||
|
".json",
|
||||||
|
".mp3"
|
||||||
|
],
|
||||||
|
"subMetas": {},
|
||||||
|
"userData": {
|
||||||
|
"downloadMode": 0
|
||||||
|
}
|
||||||
|
}
|
||||||
BIN
assets/resources/music/dun.mp3
Normal file
BIN
assets/resources/music/dun.mp3
Normal file
Binary file not shown.
14
assets/resources/music/dun.mp3.meta
Normal file
14
assets/resources/music/dun.mp3.meta
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
{
|
||||||
|
"ver": "1.0.0",
|
||||||
|
"importer": "audio-clip",
|
||||||
|
"imported": true,
|
||||||
|
"uuid": "7c92881a-8fe9-4c48-bbe0-8f1989d6e3f1",
|
||||||
|
"files": [
|
||||||
|
".json",
|
||||||
|
".mp3"
|
||||||
|
],
|
||||||
|
"subMetas": {},
|
||||||
|
"userData": {
|
||||||
|
"downloadMode": 0
|
||||||
|
}
|
||||||
|
}
|
||||||
Binary file not shown.
@@ -1,14 +0,0 @@
|
|||||||
{
|
|
||||||
"ver": "1.0.0",
|
|
||||||
"importer": "audio-clip",
|
|
||||||
"imported": true,
|
|
||||||
"uuid": "4ced6d9e-6d28-40ed-a43e-7f1911ad5e22",
|
|
||||||
"files": [
|
|
||||||
".json",
|
|
||||||
".wav"
|
|
||||||
],
|
|
||||||
"subMetas": {},
|
|
||||||
"userData": {
|
|
||||||
"downloadMode": 0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
BIN
assets/resources/music/flash.mp3
Normal file
BIN
assets/resources/music/flash.mp3
Normal file
Binary file not shown.
14
assets/resources/music/flash.mp3.meta
Normal file
14
assets/resources/music/flash.mp3.meta
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
{
|
||||||
|
"ver": "1.0.0",
|
||||||
|
"importer": "audio-clip",
|
||||||
|
"imported": true,
|
||||||
|
"uuid": "683c1c7a-97da-4694-a96a-f83df6575d73",
|
||||||
|
"files": [
|
||||||
|
".json",
|
||||||
|
".mp3"
|
||||||
|
],
|
||||||
|
"subMetas": {},
|
||||||
|
"userData": {
|
||||||
|
"downloadMode": 0
|
||||||
|
}
|
||||||
|
}
|
||||||
BIN
assets/resources/music/home.mp3
Normal file
BIN
assets/resources/music/home.mp3
Normal file
Binary file not shown.
14
assets/resources/music/home.mp3.meta
Normal file
14
assets/resources/music/home.mp3.meta
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
{
|
||||||
|
"ver": "1.0.0",
|
||||||
|
"importer": "audio-clip",
|
||||||
|
"imported": true,
|
||||||
|
"uuid": "8c59d18e-9b43-46e5-8249-39d98ffec825",
|
||||||
|
"files": [
|
||||||
|
".json",
|
||||||
|
".mp3"
|
||||||
|
],
|
||||||
|
"subMetas": {},
|
||||||
|
"userData": {
|
||||||
|
"downloadMode": 0
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -89,6 +89,7 @@ export class HeroViewComp extends CCComp {
|
|||||||
private onHeroClicked() {
|
private onHeroClicked() {
|
||||||
if (!this.model) return;
|
if (!this.model) return;
|
||||||
if (this.model.fac !== FacSet.HERO) return;
|
if (this.model.fac !== FacSet.HERO) return;
|
||||||
|
oops.audio.playEffect("music/button");
|
||||||
|
|
||||||
const eid = this.ent?.eid;
|
const eid = this.ent?.eid;
|
||||||
if (!eid) return;
|
if (!eid) return;
|
||||||
|
|||||||
@@ -229,6 +229,9 @@ export class SCastSystem extends ecs.ComblockSystem implements ecs.ISystemUpdate
|
|||||||
heroView.playOther('yellow')
|
heroView.playOther('yellow')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 播放特殊技能触发音效
|
||||||
|
oops.audio.playEffect("music/flash");
|
||||||
|
|
||||||
// 如果是敌方攻击技能,必须在战斗中才能释放;友方增益/护盾则允许在非战斗中释放
|
// 如果是敌方攻击技能,必须在战斗中才能释放;友方增益/护盾则允许在非战斗中释放
|
||||||
let config = SkillSet[s_uuid];
|
let config = SkillSet[s_uuid];
|
||||||
if (!config) return;
|
if (!config) return;
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
* @LastEditors: dgflash
|
* @LastEditors: dgflash
|
||||||
* @LastEditTime: 2022-08-17 12:38:59
|
* @LastEditTime: 2022-08-17 12:38:59
|
||||||
*/
|
*/
|
||||||
import { Node } from "cc";
|
import { Node, Button } from "cc";
|
||||||
import { UICallbacks } from "../../../../extensions/oops-plugin-framework/assets/core/gui/layer/Defines";
|
import { UICallbacks } from "../../../../extensions/oops-plugin-framework/assets/core/gui/layer/Defines";
|
||||||
import { oops } from "../../../../extensions/oops-plugin-framework/assets/core/Oops";
|
import { oops } from "../../../../extensions/oops-plugin-framework/assets/core/Oops";
|
||||||
import { AsyncQueue, NextFunction } from "../../../../extensions/oops-plugin-framework/assets/libs/collection/AsyncQueue";
|
import { AsyncQueue, NextFunction } from "../../../../extensions/oops-plugin-framework/assets/libs/collection/AsyncQueue";
|
||||||
@@ -27,6 +27,19 @@ export class Initialize extends ecs.Entity {
|
|||||||
debugMode: boolean = false; // 是否启用调试模式
|
debugMode: boolean = false; // 是否启用调试模式
|
||||||
protected init() {
|
protected init() {
|
||||||
var queue: AsyncQueue = new AsyncQueue();
|
var queue: AsyncQueue = new AsyncQueue();
|
||||||
|
|
||||||
|
// --- 全局注入:为所有 Button 组件增加点击音效 ---
|
||||||
|
const originalOnTouchEnded = Button.prototype["_onTouchEnded"];
|
||||||
|
if (originalOnTouchEnded) {
|
||||||
|
Button.prototype["_onTouchEnded"] = function(event) {
|
||||||
|
if (this.interactable && this.node && this.node.activeInHierarchy) {
|
||||||
|
oops.audio.playEffect("music/button");
|
||||||
|
}
|
||||||
|
originalOnTouchEnded.call(this, event);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
// ---------------------------------------------
|
||||||
|
|
||||||
// 加载自定义资
|
// 加载自定义资
|
||||||
this.loadCustom(queue);
|
this.loadCustom(queue);
|
||||||
// 加载多语言包
|
// 加载多语言包
|
||||||
|
|||||||
@@ -275,8 +275,7 @@ export class HInfoComp extends CCComp {
|
|||||||
this.previewPoolLv = poolLv;
|
this.previewPoolLv = poolLv;
|
||||||
this.isSkillCard = isSkillCard;
|
this.isSkillCard = isSkillCard;
|
||||||
if (this.sell_node) this.sell_node.active = false;
|
if (this.sell_node) this.sell_node.active = false;
|
||||||
// 如果是技能卡预览模式(即点击了战场上的技能),允许关闭弹窗
|
if (this.close_node) this.close_node.active = true;
|
||||||
if (this.close_node) this.close_node.active = isSkillCard;
|
|
||||||
this.cacheLabels();
|
this.cacheLabels();
|
||||||
this.refresh();
|
this.refresh();
|
||||||
}
|
}
|
||||||
|
|||||||
90
assets/script/game/map/HeroMoveComp.ts
Normal file
90
assets/script/game/map/HeroMoveComp.ts
Normal file
@@ -0,0 +1,90 @@
|
|||||||
|
import { _decorator, Component, Node, Animation, Vec3 } from "cc";
|
||||||
|
const { ccclass, property } = _decorator;
|
||||||
|
|
||||||
|
@ccclass('HeroMoveComp')
|
||||||
|
export class HeroMoveComp extends Component {
|
||||||
|
|
||||||
|
@property({ type: Node })
|
||||||
|
hero1: Node = null!;
|
||||||
|
@property({ type: Node })
|
||||||
|
hero2: Node = null!;
|
||||||
|
@property({ type: Node })
|
||||||
|
hero3: Node = null!;
|
||||||
|
@property({ type: Node })
|
||||||
|
hero4: Node = null!;
|
||||||
|
@property({ type: Node })
|
||||||
|
hero5: Node = null!;
|
||||||
|
|
||||||
|
// 控制移动速度的基础参数
|
||||||
|
private baseSpeed: number = 20; // 每秒向右移动的基础像素速度
|
||||||
|
private timer: number = 0;
|
||||||
|
// 为每个英雄保存其对应的 Animation 和随机参数
|
||||||
|
private heroDatas: { node: Node, anim: Animation | null, startX: number, phase: number }[] = [];
|
||||||
|
|
||||||
|
onLoad() {
|
||||||
|
const heroes = [this.hero1, this.hero2, this.hero3, this.hero4, this.hero5];
|
||||||
|
|
||||||
|
heroes.forEach(heroNode => {
|
||||||
|
if (heroNode) {
|
||||||
|
// 查找名为 "h" 的子节点
|
||||||
|
const hNode = heroNode.getChildByName("h");
|
||||||
|
let anim: Animation | null = null;
|
||||||
|
if (hNode) {
|
||||||
|
anim = hNode.getComponent(Animation);
|
||||||
|
// 确保有动画组件才尝试播放
|
||||||
|
if (anim && anim.clips && anim.clips.length > 0) {
|
||||||
|
anim.play("move");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
this.heroDatas.push({
|
||||||
|
node: heroNode,
|
||||||
|
anim: anim,
|
||||||
|
startX: heroNode.position.x, // 记录初始X位置
|
||||||
|
phase: Math.random() * Math.PI * 2 // 随机初始相位
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
update(dt: number) {
|
||||||
|
this.timer += dt;
|
||||||
|
|
||||||
|
this.heroDatas.forEach(data => {
|
||||||
|
if (!data.node) return;
|
||||||
|
|
||||||
|
// 设置周期为 4 秒 (例如:1秒加速向右,1秒减速回原点,1秒减速向左,1秒加速回原点)
|
||||||
|
// 使用正弦波控制速度,余弦波控制位移(因为速度是位移的导数)
|
||||||
|
const cycleDuration = 4;
|
||||||
|
const frequency = (Math.PI * 2) / cycleDuration;
|
||||||
|
|
||||||
|
// 速度倍率,范围在 0.9 ~ 1.1 之间波动
|
||||||
|
// sin 波形在 4秒周期内,正负各占 2秒
|
||||||
|
const speedMultiplier = 1.0 + Math.sin(this.timer * frequency + data.phase) * 0.1;
|
||||||
|
|
||||||
|
// 调整动画的播放速度
|
||||||
|
if (data.anim) {
|
||||||
|
// 检查状态是否存在,以避免没有播放动画时的错误
|
||||||
|
const state = data.anim.getState("move");
|
||||||
|
if (state && state.isPlaying) {
|
||||||
|
state.speed = speedMultiplier;
|
||||||
|
} else if (data.anim.clips && data.anim.clips.length > 0) {
|
||||||
|
// 如果停止了,尝试重新播放
|
||||||
|
data.anim.play("move");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 根据时间计算位置偏移量
|
||||||
|
// 使用 -cos 函数,使得当速度(sin)为最大时,位置在原点,
|
||||||
|
// 积分关系:速度 v = A * sin(wt),位移 s = - (A/w) * cos(wt)
|
||||||
|
// 这样能保证在一个周期内它始终围绕原点往复运动,最终回到原始点
|
||||||
|
const maxOffset = 30; // 左右偏离原点的最大像素距离
|
||||||
|
const currentOffset = -Math.cos(this.timer * frequency + data.phase) * maxOffset;
|
||||||
|
|
||||||
|
const pos = data.node.position;
|
||||||
|
// 相对于初始点进行位置设置,确保周期性回到原始点
|
||||||
|
data.node.setPosition(new Vec3(data.startX + currentOffset, pos.y, pos.z));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
9
assets/script/game/map/HeroMoveComp.ts.meta
Normal file
9
assets/script/game/map/HeroMoveComp.ts.meta
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
{
|
||||||
|
"ver": "4.0.24",
|
||||||
|
"importer": "typescript",
|
||||||
|
"imported": true,
|
||||||
|
"uuid": "46ae5df5-c745-4689-bef6-f2300a78d15e",
|
||||||
|
"files": [],
|
||||||
|
"subMetas": {},
|
||||||
|
"userData": {}
|
||||||
|
}
|
||||||
@@ -643,6 +643,7 @@ export class MissionCardComp extends CCComp {
|
|||||||
}
|
}
|
||||||
/** 抽卡按钮释放 → 执行抽卡逻辑 */
|
/** 抽卡按钮释放 → 执行抽卡逻辑 */
|
||||||
private onDrawTouchEnd() {
|
private onDrawTouchEnd() {
|
||||||
|
oops.audio.playEffect("music/button");
|
||||||
this.playButtonClickAnim(this.cards_chou, () => this.onClickDraw());
|
this.playButtonClickAnim(this.cards_chou, () => this.onClickDraw());
|
||||||
}
|
}
|
||||||
/** 抽卡按钮取消 → 恢复缩放 */
|
/** 抽卡按钮取消 → 恢复缩放 */
|
||||||
@@ -655,6 +656,7 @@ export class MissionCardComp extends CCComp {
|
|||||||
this.playButtonPressAnim(this.skill_refresh);
|
this.playButtonPressAnim(this.skill_refresh);
|
||||||
}
|
}
|
||||||
private onSkillDrawTouchEnd() {
|
private onSkillDrawTouchEnd() {
|
||||||
|
oops.audio.playEffect("music/button");
|
||||||
this.playButtonClickAnim(this.skill_refresh, () => this.onClickSkillRefresh());
|
this.playButtonClickAnim(this.skill_refresh, () => this.onClickSkillRefresh());
|
||||||
}
|
}
|
||||||
private onSkillDrawTouchCancel() {
|
private onSkillDrawTouchCancel() {
|
||||||
@@ -665,6 +667,7 @@ export class MissionCardComp extends CCComp {
|
|||||||
this.playButtonPressAnim(this.skill_ad_refresh);
|
this.playButtonPressAnim(this.skill_ad_refresh);
|
||||||
}
|
}
|
||||||
private onSkillAdDrawTouchEnd() {
|
private onSkillAdDrawTouchEnd() {
|
||||||
|
oops.audio.playEffect("music/button");
|
||||||
this.playButtonClickAnim(this.skill_ad_refresh, () => this.onClickSkillAdRefresh());
|
this.playButtonClickAnim(this.skill_ad_refresh, () => this.onClickSkillAdRefresh());
|
||||||
}
|
}
|
||||||
private onSkillAdDrawTouchCancel() {
|
private onSkillAdDrawTouchCancel() {
|
||||||
|
|||||||
@@ -117,7 +117,7 @@ export class MissionComp extends CCComp {
|
|||||||
|
|
||||||
// ======================== 运行时状态 ========================
|
// ======================== 运行时状态 ========================
|
||||||
|
|
||||||
/** 战斗已耗时(秒),正向计时 */
|
/** 本波战斗已耗时(秒),正向计时,用于自适应难度评估 */
|
||||||
clearTime: number = 0
|
clearTime: number = 0
|
||||||
/** 剩余复活次数 */
|
/** 剩余复活次数 */
|
||||||
revive_times: number = 1;
|
revive_times: number = 1;
|
||||||
@@ -242,7 +242,7 @@ export class MissionComp extends CCComp {
|
|||||||
|
|
||||||
/** 更新时间/波数显示(仅在秒数变化时更新以减少 Label 操作) */
|
/** 更新时间/波数显示(仅在秒数变化时更新以减少 Label 操作) */
|
||||||
update_time() {
|
update_time() {
|
||||||
const remainSecond = Math.floor(this.clearTime);
|
const remainSecond = Math.floor(smc.vmdata.mission_data.fight_time);
|
||||||
if (remainSecond === this.lastTimeSecond) return;
|
if (remainSecond === this.lastTimeSecond) return;
|
||||||
this.lastTimeSecond = remainSecond;
|
this.lastTimeSecond = remainSecond;
|
||||||
let m = Math.floor(remainSecond / 60);
|
let m = Math.floor(remainSecond / 60);
|
||||||
@@ -307,6 +307,10 @@ export class MissionComp extends CCComp {
|
|||||||
loading.active = false
|
loading.active = false
|
||||||
}, 0.5)
|
}, 0.5)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 播放战斗背景音乐,并稍微降低音量
|
||||||
|
oops.audio.volumeMusic = 0.5;
|
||||||
|
oops.audio.playerMusicLoop("music/BATTLE");
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 更新开始按钮的状态显示 */
|
/** 更新开始按钮的状态显示 */
|
||||||
@@ -396,7 +400,7 @@ export class MissionComp extends CCComp {
|
|||||||
const label = phaseNode.getComponent(Label);
|
const label = phaseNode.getComponent(Label);
|
||||||
if (label) {
|
if (label) {
|
||||||
const wave = Math.max(1, this.currentWave || (smc.vmdata && smc.vmdata.mission_data ? smc.vmdata.mission_data.level : 1) || 1);
|
const wave = Math.max(1, this.currentWave || (smc.vmdata && smc.vmdata.mission_data ? smc.vmdata.mission_data.level : 1) || 1);
|
||||||
label.string = `第 ${wave}/15 波`;
|
label.string = `第 ${wave} 波`;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 阶段切换动感表现:只在进入战斗阶段跳动一下,让流程充满心流体验
|
// 阶段切换动感表现:只在进入战斗阶段跳动一下,让流程充满心流体验
|
||||||
@@ -636,6 +640,8 @@ export class MissionComp extends CCComp {
|
|||||||
if (!smc.mission.play) return;
|
if (!smc.mission.play) return;
|
||||||
if (smc.mission.pause) return;
|
if (smc.mission.pause) return;
|
||||||
if (this.currentPhase !== MissionPhase.Prepare) return;
|
if (this.currentPhase !== MissionPhase.Prepare) return;
|
||||||
|
|
||||||
|
oops.audio.playEffect("music/button");
|
||||||
this.to_fight();
|
this.to_fight();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -156,6 +156,9 @@ export class MissionHomeComp extends CCComp {
|
|||||||
this.uodate_data()
|
this.uodate_data()
|
||||||
this.hideAllPages()
|
this.hideAllPages()
|
||||||
this.node.active=true
|
this.node.active=true
|
||||||
|
// 播放主页背景音乐,恢复默认音量
|
||||||
|
oops.audio.volumeMusic = 1.0;
|
||||||
|
oops.audio.playerMusicLoop("music/home")
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 更新主页显示数据(预留) */
|
/** 更新主页显示数据(预留) */
|
||||||
|
|||||||
@@ -117,6 +117,7 @@ export class SkillBoxComp extends CCComp {
|
|||||||
|
|
||||||
private onNodeClicked() {
|
private onNodeClicked() {
|
||||||
if (!this.initialized) return;
|
if (!this.initialized) return;
|
||||||
|
oops.audio.playEffect("music/button");
|
||||||
// 点击时弹出 HInfoComp,传入卡牌 UUID 和等级以启用预览模式
|
// 点击时弹出 HInfoComp,传入卡牌 UUID 和等级以启用预览模式
|
||||||
const config = CardPoolList.find(c => c.uuid === this.s_uuid || c.skill === this.s_uuid);
|
const config = CardPoolList.find(c => c.uuid === this.s_uuid || c.skill === this.s_uuid);
|
||||||
const cardUuid = config ? config.uuid : this.s_uuid;
|
const cardUuid = config ? config.uuid : this.s_uuid;
|
||||||
|
|||||||
Reference in New Issue
Block a user