Compare commits
3 Commits
4460c1aaf2
...
10ab03b871
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
10ab03b871 | ||
|
|
7dd5257fd8 | ||
|
|
b0d752ab18 |
@@ -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",
|
||||||
|
|||||||
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
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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;
|
||||||
|
|||||||
@@ -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");
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 更新开始按钮的状态显示 */
|
/** 更新开始按钮的状态显示 */
|
||||||
|
|||||||
@@ -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")
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 更新主页显示数据(预留) */
|
/** 更新主页显示数据(预留) */
|
||||||
|
|||||||
Reference in New Issue
Block a user