Skip to content

Commit 554a281

Browse files
author
lijiahao
committed
feat: co-op supported
1 parent b9fbba2 commit 554a281

File tree

20 files changed

+59
-11
lines changed

20 files changed

+59
-11
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"uplot": "^1.6.30",
4343
"uuid-1345": "^1.0.2",
4444
"xbox-webapi": "^1.4.1",
45-
"xstreaming-player": "0.2.27",
45+
"xstreaming-player": "0.2.28",
4646
"xvfb-maybe": "^0.2.1"
4747
},
4848
"devDependencies": {

renderer/common/settings.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,16 @@ const getSettingsMetas = (t) => {
248248
},
249249
],
250250
gamepad: [
251+
{
252+
name: 'coop',
253+
type: 'radio',
254+
title: t('coop_title'),
255+
description: t('coop_desc'),
256+
data: [
257+
{value: false, label: t('Disable')},
258+
{value: true, label: t('Enable')},
259+
],
260+
},
251261
{
252262
name: 'dead_zone',
253263
type: 'slider',

renderer/components/AchivementModal.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ function AchivementModal(props) {
4343
return (
4444
<Modal
4545
isOpen={true}
46-
size="full"
46+
size="5xl"
4747
scrollBehavior="inside"
4848
onClose={handleClose}
4949
>
@@ -84,6 +84,7 @@ function AchivementModal(props) {
8484
alt={item.name}
8585
width={300}
8686
height={100}
87+
draggable="false"
8788
/>
8889
{
8990
item.progressState !== 'Achieved' && (
@@ -93,6 +94,7 @@ function AchivementModal(props) {
9394
alt="lock"
9495
width={50}
9596
height={50}
97+
draggable="false"
9698
/>
9799
</div>
98100
)

renderer/components/Loading.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@
1414

1515
.loading img {
1616
width: 5rem;
17+
-webkit-user-drag: none;
18+
-khtml-user-drag: none;
19+
-moz-user-drag: none;
20+
-o-user-drag: none;
21+
user-drag: none;
1722
}
1823
.loadingText {
1924
color: #107C10;

renderer/components/Loading.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const Loading = ({ loadingText }) => {
22
return (
33
<div className="loading user-select-none">
44
<div>
5-
<img src='/images/loading.svg' alt="" />
5+
<img src='/images/loading.svg' alt="" draggable="false" />
66
</div>
77
<div className="loadingText">{loadingText}</div>
88
</div>

renderer/components/Nav.tsx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,14 @@ const Nav = ({ current, isLogined }) => {
9696
<div className="px-1 py-2">
9797
<div className="text-small">{t('curVerson')}: <span className="text-yellow-500 pl-1">v{newVersions.version}</span></div>
9898
<div className="text-small">{t('latestVerson')}: <span className="text-green-500 pl-1">v{newVersions.latestVer}</span></div>
99+
<div className="text-center">
100+
<Button color="success" size="sm" variant="light" onPress={() => {
101+
window.open(newVersions.url, '_blank')
102+
}}>
103+
{t('Download')}
104+
</Button>
105+
</div>
106+
99107
</div>
100108
</PopoverContent>
101109
</Popover>

renderer/components/TitleModal.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ function TitleModal(props) {
6262
// className="object-cover rounded-lg"
6363
isZoomed
6464
loading={'lazy'}
65+
draggable="false"
6566
src={'https:' + titleItem.Image_Poster.URL}
6667
/>
6768
</div>

renderer/context/userContext.defaults.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ export const defaultSettings = {
1717
force_region_ip: "",
1818
codec: "",
1919
polling_rate: 250,
20+
coop: false,
2021
vibration: true,
2122
vibration_mode: "Native",
2223
gamepad_kernal: "Native",

renderer/pages/[locale]/home.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -588,6 +588,7 @@ function Home() {
588588
<Image
589589
src={consoleImg}
590590
alt="xss"
591+
draggable="false"
591592
width={130}
592593
height={130}
593594
/>

renderer/pages/[locale]/stream.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,11 @@ function Stream() {
234234
xPlayer.setPollRate(settings.polling_rate)
235235
}
236236

237+
// Set co-op mode
238+
if (settings.coop) {
239+
xPlayer.setCoOpMode(true)
240+
}
241+
237242
xPlayer.setConnectFailHandler(() => {
238243
// Not connected
239244
setShowWarning(false);

0 commit comments

Comments
 (0)