Skip to content

Commit

Permalink
Merge pull request #72 from MajsoulPlus/typescript
Browse files Browse the repository at this point in the history
[2.0.0] 完成 TypeScript 重构
  • Loading branch information
Handle committed Jul 16, 2019
2 parents a8fc75b + 1e6f27b commit dff7f1f
Show file tree
Hide file tree
Showing 161 changed files with 8,656 additions and 13,766 deletions.
3 changes: 3 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Language: JavaScript
BasedOnStyle: Google
ColumnLimit: 80
3 changes: 0 additions & 3 deletions .eslintrc.js

This file was deleted.

14 changes: 13 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,16 @@ typings/
package-lock.json
static/
build/
manager/**/*.css
dist/
assets/manager/**/*.css

# vscode
.vscode/

# portable data
data/

# exported files
*.mspm
*.mspe
*.mspt
21 changes: 5 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ language: node_js
- 10
cache:
- apt: true
- yarn: true
- directories:
- node_modules
- $HOME/.electron
Expand All @@ -16,21 +17,9 @@ addons:
homebrew:
packages: zip
before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then npm i --save-dev [email protected]; fi
- nvm install 10
- npm install -g yarn
install:
- npm install
- npm update
- yarn
script:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then npm run build-linux; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then npm run build-darwin; fi
after_success: if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then bash pack.sh; fi
deploy:
provider: releases
api_key: $GITHUB_TOKEN
file: './build/packed/*.{zip,dmg}'
file_glob: true
skip_cleanup: true
on:
branch: master
tags: true
all_branches: true
- yarn dist
24 changes: 15 additions & 9 deletions README.MD → Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
- 本地缓存机制,可有效提高游戏加载速度
- 适配 OBS 等视频采集软件,方便播主直播使用
- 易于自定义的本地缓存
- 为额外功能提供插件接口支持
- 为额外功能提供扩展接口支持

[稳定版: ![VersionLatest](https://img.shields.io/github/release/MajsoulPlus/majsoul-plus-client.svg)
![DownloadsLatest](https://img.shields.io/github/downloads/iamapig120/majsoul-plus-client/latest/total.svg)](https://github.com/iamapig120/majsoul-plus-client/releases/latest)
Expand Down Expand Up @@ -44,12 +44,18 @@

## 从源码启动

请确保 Git, node.js 和 NPM 已经被正确安装
请确保 Git, Node.js 和 yarn 已经被正确安装

1. `git clone [email protected]:MajsoulPlus/majsoul-plus-client.git`
2. `cd majsoul-plus-client`
3. `npm install`
4. `npm start`
3. `yarn`
4. `yarn start`

如果你使用的是 ArchLinux 系,注意要在 `yarn start` 之前安装 `gconf` 才能正常运行:

```bash
sudo pacman -S gconf
```

## 快捷键

Expand All @@ -59,9 +65,9 @@

## 制作模组

- 模组 [浏览 Wiki](https://github.com/MajsoulPlus/majsoul-plus/wiki/CourseMod)
- 插件 [浏览 Wiki](https://github.com/MajsoulPlus/majsoul-plus/wiki/CourseExecute)
- 工具 [浏览 Wiki](https://github.com/MajsoulPlus/majsoul-plus/wiki/CourseTool)
- 资源包 [浏览 Wiki](https://github.com/MajsoulPlus/majsoul-plus/wiki/v2_resourcepack)
- 扩展 [浏览 Wiki](https://github.com/MajsoulPlus/majsoul-plus/wiki/v2_extension)
- 工具 [浏览 Wiki](https://github.com/MajsoulPlus/majsoul-plus/wiki/v2_tool)

## 协助翻译

Expand Down Expand Up @@ -98,6 +104,6 @@

## 参与讨论

使用答疑,资源分享,约战交流 QQ群 [660996459](https://jq.qq.com/?_wv=1027&k=5PMNS8D)
使用答疑,资源分享,约战交流 QQ 群 [660996459](https://jq.qq.com/?_wv=1027&k=5PMNS8D)

开发问题,技术疑问,批判一番 QQ群 [106475557](https://jq.qq.com/?_wv=1027&k=5iayYP5)
开发问题,技术疑问,批判一番 QQ 群 [106475557](https://jq.qq.com/?_wv=1027&k=5iayYP5)
Loading

0 comments on commit dff7f1f

Please sign in to comment.