diff --git a/Config/Weapon.xlsx b/Config/Weapon.xlsx index 6b5450f..1242d80 100644 Binary files a/Config/Weapon.xlsx and b/Config/Weapon.xlsx differ diff --git a/assets/resources/data/Weapon.json b/assets/resources/data/Weapon.json index 65eac43..5b20479 100644 --- a/assets/resources/data/Weapon.json +++ b/assets/resources/data/Weapon.json @@ -1 +1 @@ -[{"id":1,"prefab":"Wep_HandGun","point":"HandGun","coin":0,"gunName":"\u6c99\u6f20\u4e4b\u9e70","spriteName":"WEP_HandGun"},{"id":2,"prefab":"Wep_Rifle_1","point":"Rifle","coin":1000,"gunName":"M4A1","spriteName":"WEP_M4A1 copy"},{"id":3,"prefab":"Wep_Rifle_2","point":"Rifle","coin":1000,"gunName":"\u9690\u533f\u6740\u624b","spriteName":"WEP_Rifle_2"},{"id":4,"prefab":"Wep_Rifle_3","point":"Rifle","coin":1000,"gunName":"\u88c1\u51b3\u8005","spriteName":"WEP_Rifle_3"},{"id":5,"prefab":"Wep_Rifle_4","point":"Rifle","coin":1000,"gunName":"\u7834\u6653\u7a81\u88ad","spriteName":"WEP_Rifle_4"},{"id":6,"prefab":"Wep_Sniper_AWP","point":"Rifle","coin":2500,"gunName":"AWP","spriteName":"WEP_Sniper_AWP"},{"id":7,"prefab":"Wep_Rifle_98k","point":"Rifle","coin":2500,"gunName":"98K","spriteName":"WEP_98k"},{"id":8,"prefab":"Wep_Sniper_01","point":"Rifle","coin":3000,"gunName":"\u661f\u8000\u6218\u96bc","spriteName":"WEP_Sniper_1"}] \ No newline at end of file +[{"id":1,"prefab":"Wep_HandGun","point":"HandGun","coin":0,"gunName":"Desert Eagle","spriteName":"WEP_HandGun"},{"id":2,"prefab":"Wep_Rifle_1","point":"Rifle","coin":1000,"gunName":"M4A1","spriteName":"WEP_M4A1 copy"},{"id":3,"prefab":"Wep_Rifle_2","point":"Rifle","coin":1000,"gunName":"Silent Assassin","spriteName":"WEP_Rifle_2"},{"id":4,"prefab":"Wep_Rifle_3","point":"Rifle","coin":1000,"gunName":"Arbiter","spriteName":"WEP_Rifle_3"},{"id":5,"prefab":"Wep_Rifle_4","point":"Rifle","coin":1000,"gunName":"Dawn Assault","spriteName":"WEP_Rifle_4"},{"id":6,"prefab":"Wep_Sniper_AWP","point":"Rifle","coin":2500,"gunName":"AWP","spriteName":"WEP_Sniper_AWP"},{"id":7,"prefab":"Wep_Rifle_98k","point":"Rifle","coin":2500,"gunName":"98K","spriteName":"WEP_98k"},{"id":8,"prefab":"Wep_Sniper_01","point":"Rifle","coin":3000,"gunName":"Starlight Falcon","spriteName":"WEP_Sniper_1"}] diff --git a/assets/resources/prefabs/AlineLaugh.prefab b/assets/resources/prefabs/AlineLaugh.prefab index 154e624..b7b8dcf 100644 --- a/assets/resources/prefabs/AlineLaugh.prefab +++ b/assets/resources/prefabs/AlineLaugh.prefab @@ -350,7 +350,7 @@ "__id__": 13 }, "_lineHeight": 40, - "_string": "让我看看谁眼神这么好", + "_string": "Good eye! You found me.", "_horizontalAlign": 0, "_verticalAlign": 0, "_fontSize": 40, @@ -579,4 +579,4 @@ "instance": null, "targetOverrides": null } -] \ No newline at end of file +] diff --git a/assets/resources/ui/AddHeartPanel.prefab b/assets/resources/ui/AddHeartPanel.prefab index bd9ff05..e480ce3 100644 --- a/assets/resources/ui/AddHeartPanel.prefab +++ b/assets/resources/ui/AddHeartPanel.prefab @@ -555,7 +555,7 @@ "b": 0, "a": 255 }, - "_string": "重试", + "_string": "Retry", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 20, @@ -817,7 +817,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -86.017, + "x": -227.62, "y": 316.965, "z": 0 }, @@ -997,7 +997,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 188, + "width": 400, "height": 134 }, "_anchorPoint": { @@ -1033,14 +1033,14 @@ "b": 255, "a": 255 }, - "_string": "加油站", + "_string": "Energy Station", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 60, "_fontSize": 60, "_fontFamily": "Arial", "_lineHeight": 100, - "_overflow": 0, + "_overflow": 2, "_enableWrapText": true, "_font": null, "_isSystemFontUsed": true, @@ -2715,7 +2715,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 563.615234375, + "width": 506.4375, "height": 233.99999999999997 }, "_anchorPoint": { @@ -2751,7 +2751,7 @@ "b": 255, "a": 255 }, - "_string": "观看一个30秒的广告即可\n获得3个 !", + "_string": "Watch a 30-second ad\nto get 3 !", "_horizontalAlign": 0, "_verticalAlign": 1, "_actualFontSize": 50, @@ -3401,7 +3401,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -55.404, + "x": -31.301, "y": 44.807, "z": 0 }, diff --git a/assets/resources/ui/LoadingPanel.prefab b/assets/resources/ui/LoadingPanel.prefab index ebe759f..1b6a85f 100644 --- a/assets/resources/ui/LoadingPanel.prefab +++ b/assets/resources/ui/LoadingPanel.prefab @@ -347,14 +347,14 @@ "b": 255, "a": 255 }, - "_string": "外星人可能躲在任何角落,仔细查找", + "_string": "Aliens hide anywhere. Look carefully.", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 40, "_fontSize": 40, "_fontFamily": "Arial", "_lineHeight": 200, - "_overflow": 0, + "_overflow": 2, "_enableWrapText": true, "_font": null, "_isSystemFontUsed": true, @@ -819,4 +819,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 8ca62be..d00d8a9 100644 --- a/assets/resources/ui/LosePanel.prefab +++ b/assets/resources/ui/LosePanel.prefab @@ -956,7 +956,7 @@ "b": 255, "a": 255 }, - "_string": "加时3分钟", + "_string": "+3 min", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 50, @@ -1311,7 +1311,7 @@ "b": 255, "a": 255 }, - "_string": "剩余1个", + "_string": "1 Left", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 50, @@ -1757,4 +1757,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 0fc8c6c..0810f80 100644 --- a/assets/resources/ui/MainPanel.prefab +++ b/assets/resources/ui/MainPanel.prefab @@ -606,14 +606,14 @@ "b": 255, "a": 255 }, - "_string": "寻找外星人", + "_string": "Find the Aliens", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 200, "_fontSize": 200, "_fontFamily": "Arial", "_lineHeight": 200, - "_overflow": 0, + "_overflow": 2, "_enableWrapText": true, "_font": null, "_isSystemFontUsed": true, @@ -1417,14 +1417,14 @@ "b": 0, "a": 255 }, - "_string": "大菠萝", + "_string": "Desert Eagle", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 40, "_fontSize": 40, "_fontFamily": "Arial", "_lineHeight": 40, - "_overflow": 1, + "_overflow": 2, "_enableWrapText": false, "_font": null, "_isSystemFontUsed": true, @@ -1636,14 +1636,14 @@ "b": 0, "a": 255 }, - "_string": "清楚存档", + "_string": "Clear Save Data", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 40, "_fontSize": 40, "_fontFamily": "Arial", "_lineHeight": 40, - "_overflow": 1, + "_overflow": 2, "_enableWrapText": false, "_font": null, "_isSystemFontUsed": true, @@ -2408,7 +2408,7 @@ "b": 255, "a": 255 }, - "_string": "已满", + "_string": "Full", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 50, @@ -5749,14 +5749,14 @@ "b": 255, "a": 255 }, - "_string": "已装备", + "_string": "Equipped", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 50, "_fontSize": 50, "_fontFamily": "Arial", "_lineHeight": 50, - "_overflow": 1, + "_overflow": 2, "_enableWrapText": false, "_font": null, "_isSystemFontUsed": true, diff --git a/assets/resources/ui/PlayPanel.prefab b/assets/resources/ui/PlayPanel.prefab index 98586ec..7a9e48c 100644 --- a/assets/resources/ui/PlayPanel.prefab +++ b/assets/resources/ui/PlayPanel.prefab @@ -3439,14 +3439,14 @@ "b": 255, "a": 255 }, - "_string": "点击瞄准", + "_string": "Tap to Aim", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 50, "_fontSize": 50, "_fontFamily": "Arial", "_lineHeight": 50, - "_overflow": 0, + "_overflow": 2, "_enableWrapText": true, "_font": null, "_isSystemFontUsed": true, @@ -4214,14 +4214,14 @@ "b": 255, "a": 255 }, - "_string": "点击任意位置取消射击", + "_string": "Tap anywhere to cancel", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 50, "_fontSize": 50, "_fontFamily": "Arial", "_lineHeight": 50, - "_overflow": 0, + "_overflow": 2, "_enableWrapText": true, "_font": null, "_isSystemFontUsed": true, @@ -5540,14 +5540,14 @@ "b": 255, "a": 255 }, - "_string": "第一关", + "_string": "Level 1", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 40, "_fontSize": 40, "_fontFamily": "Arial", "_lineHeight": 40, - "_overflow": 0, + "_overflow": 2, "_enableWrapText": true, "_font": null, "_isSystemFontUsed": true, @@ -6503,7 +6503,7 @@ "b": 0, "a": 255 }, - "_string": "滑动屏幕,瞄准目标外星人", + "_string": "Swipe to aim at the alien", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 50, @@ -7021,4 +7021,4 @@ "5bU6q1YxVOZYqFnc16PcJS" ] } -] \ No newline at end of file +] diff --git a/assets/resources/ui/SettingPanel.prefab b/assets/resources/ui/SettingPanel.prefab index 12b12c9..b657d84 100644 --- a/assets/resources/ui/SettingPanel.prefab +++ b/assets/resources/ui/SettingPanel.prefab @@ -537,7 +537,7 @@ "b": 0, "a": 255 }, - "_string": "重试", + "_string": "Retry", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 20, @@ -772,6 +772,8 @@ "__id__": 0 }, "fileId": "f88yRIPZ5FgLqV1EX/joMg", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -841,7 +843,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 128, + "width": 300, "height": 134 }, "_anchorPoint": { @@ -877,14 +879,14 @@ "b": 255, "a": 255 }, - "_string": "设置", + "_string": "Settings", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 60, + "_actualFontSize": 61, "_fontSize": 60, "_fontFamily": "Arial", "_lineHeight": 100, - "_overflow": 0, + "_overflow": 2, "_enableWrapText": true, "_font": null, "_isSystemFontUsed": true, @@ -968,6 +970,8 @@ "__id__": 0 }, "fileId": "fbZkWTr9VK44YQ3XGCIKtS", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -1421,6 +1425,8 @@ "__id__": 0 }, "fileId": "66H+7ZPHxA+JTJWfjzyTgV", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -1874,6 +1880,8 @@ "__id__": 0 }, "fileId": "1bITorBcxFAq53ECyWBGgZ", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -2108,6 +2116,8 @@ "__id__": 0 }, "fileId": "2fvT/QpV9Co79lLEfjn/I+", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -2342,6 +2352,8 @@ "__id__": 0 }, "fileId": "e1hJpHYJ5MNJXOair7CmS4", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { diff --git a/assets/resources/ui/WeaponSelectItem.prefab b/assets/resources/ui/WeaponSelectItem.prefab index 6d55103..72e0609 100644 --- a/assets/resources/ui/WeaponSelectItem.prefab +++ b/assets/resources/ui/WeaponSelectItem.prefab @@ -163,14 +163,14 @@ "b": 255, "a": 255 }, - "_string": "沙漠之鹰", + "_string": "Desert Eagle", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 60, "_fontSize": 60, "_fontFamily": "Arial", "_lineHeight": 60, - "_overflow": 0, + "_overflow": 2, "_enableWrapText": true, "_font": null, "_isSystemFontUsed": true, @@ -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 43f8789..bc32785 100644 --- a/assets/resources/ui/WinPanel.prefab +++ b/assets/resources/ui/WinPanel.prefab @@ -842,14 +842,14 @@ "b": 255, "a": 255 }, - "_string": "关卡完成", + "_string": "Level Complete", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 150, "_fontSize": 150, "_fontFamily": "Arial", "_lineHeight": 200, - "_overflow": 0, + "_overflow": 2, "_enableWrapText": true, "_font": null, "_isSystemFontUsed": true, @@ -1001,7 +1001,7 @@ "b": 255, "a": 255 }, - "_string": "2个", + "_string": "2", "_horizontalAlign": 0, "_verticalAlign": 1, "_actualFontSize": 40, @@ -1160,7 +1160,7 @@ "b": 255, "a": 255 }, - "_string": "30秒", + "_string": "30s", "_horizontalAlign": 0, "_verticalAlign": 1, "_actualFontSize": 40, @@ -1847,7 +1847,7 @@ "b": 255, "a": 255 }, - "_string": "找到外星人:", + "_string": "Aliens Found:", "_horizontalAlign": 2, "_verticalAlign": 1, "_actualFontSize": 40, @@ -2098,7 +2098,7 @@ "b": 255, "a": 255 }, - "_string": "剩余时间:", + "_string": "Time Left:", "_horizontalAlign": 2, "_verticalAlign": 1, "_actualFontSize": 40, @@ -2488,7 +2488,7 @@ "b": 255, "a": 255 }, - "_string": "奖励:", + "_string": "Reward:", "_horizontalAlign": 2, "_verticalAlign": 1, "_actualFontSize": 40, @@ -7098,4 +7098,4 @@ } ] } -] \ No newline at end of file +] diff --git a/assets/scripts/ui/LosePanel.ts b/assets/scripts/ui/LosePanel.ts index 0b70d17..3f61fd2 100644 --- a/assets/scripts/ui/LosePanel.ts +++ b/assets/scripts/ui/LosePanel.ts @@ -41,7 +41,7 @@ export class LosePanel extends PanelBase { switch (0 as number) { case 1: break; case 2: break; - default: void ((this["remainLabel"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)["string"] = `剩余: ${(GameController["getInstance"]()["curLevel"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)["getAliveEnemeyCount"]()}`); + default: void ((this["remainLabel"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)["string"] = `${(GameController["getInstance"]()["curLevel"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)["getAliveEnemeyCount"]()} Left`); } } while (false); } diff --git a/assets/scripts/ui/MainPanel.ts b/assets/scripts/ui/MainPanel.ts index 4cd6f2d..d670119 100644 --- a/assets/scripts/ui/MainPanel.ts +++ b/assets/scripts/ui/MainPanel.ts @@ -115,7 +115,7 @@ export class MainPanel extends PanelBase { void (this["setLabelStrings"]([ [this["heart"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown, playerData["power"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown], [this["heartTimer"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown, playerData["isOnTimerRun"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown ? this["formatTime"](Math["max"](0, Math["ceil"]((LocalSaveMgr["instance"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)["getPowerCD"]()))) - : '已满'], + : 'Full'], ])); } } while (false); diff --git a/assets/scripts/ui/PlayPanel.ts b/assets/scripts/ui/PlayPanel.ts index d1135d6..3be11ac 100644 --- a/assets/scripts/ui/PlayPanel.ts +++ b/assets/scripts/ui/PlayPanel.ts @@ -17,10 +17,10 @@ import { TargetIconItem } from './TargetIconItem'; import { CombatHudAction, CombatHudModel, CombatHudSnapshot } from '../domain/CombatHudModel'; const { ccclass, property } = _decorator; const tutorialLayouts = [ - ['点击开火按钮', [[0, false], [1, false], [2, false], [3, true], [4, true]]], - ['点击瞄准按钮', [[0, true], [1, true], [3, false], [2, true]]], - ['滑动屏幕,瞄准目标', [[1, false], [3, true], [5, false], [4, false]]], - ['点击开火按钮', [[5, true], [1, true], [3, false], [4, false]]], + ['Tap the fire button', [[0, false], [1, false], [2, false], [3, true], [4, true]]], + ['Tap the aim button', [[0, true], [1, true], [3, false], [2, true]]], + ['Swipe to aim at the target', [[1, false], [3, true], [5, false], [4, false]]], + ['Tap the fire button', [[5, true], [1, true], [3, false], [4, false]]], ] as const; @ccclass('PlayPanel') export class PlayPanel extends PanelBase { @@ -114,7 +114,7 @@ export class PlayPanel extends PanelBase { default: void (this["resetPanelState"]()); void (this["initEnemies"]()); - void ((this["levelIndexLabel"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)["string"] = `关卡 ${(GameController["getInstance"]()["curLevel"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)["levelIndex"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown}`); + void ((this["levelIndexLabel"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)["string"] = `Level ${(GameController["getInstance"]()["curLevel"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)["levelIndex"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown}`); void (this["beginTutorialIfNeeded"]()); } } while (false); @@ -619,8 +619,8 @@ export class PlayPanel extends PanelBase { Vec3, () => void ]> = [ - ['DEV_KillEnemies', '开发:杀死敌人', new Vec3(350, 830, 0), this["onClickDevKillEnemies"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown], - ['DEV_CompleteLevel', '开发:完成过关', new Vec3(350, 760, 0), this["onClickDevCompleteLevel"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown], + ['DEV_KillEnemies', 'DEV: Kill Enemies', new Vec3(350, 830, 0), this["onClickDevKillEnemies"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown], + ['DEV_CompleteLevel', 'DEV: Complete Level', new Vec3(350, 760, 0), this["onClickDevCompleteLevel"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown], ]; void (buttonSpecs["forEach"]((spec) => this["createDeveloperButton"](...spec))); }