aquostics
/
VancouverSanguosha
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: aquostics:d1e5f1619257ddd1e8fbdb23257bcab35a6063fc
Branches Tags
aquostics:master
aquostics:ashui_test
..
compare: aquostics:043285dbbba621975a11de0f6a98d27a27dcbdda
Branches Tags
aquostics:master
aquostics:ashui_test

4 Commits
d1e5f16192 ... 043285dbbb

Author SHA1 Message Date
jacky_cai 043285dbbb Merge branch 'fuck' 
# Conflicts:
#	README.md
 2021-01-18 17:31:12 -08:00
jacky_cai d9edb9ff36 zzzzz 2021-01-18 17:27:00 -08:00
jacky_cai 0bb6f4e4bf fuck 2021-01-18 17:20:14 -08:00
jacky_cai 15574a8ea4 no message 2021-01-18 17:17:47 -08:00
5 changed files with 11 additions and 8 deletions
Show Stats Expand all files Collapse all files

BIN
PS文件/蜀/SHU001刘备.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
PS文件/蜀/SHU001刘备.psd (Stored with Git LFS)
View File

Binary file not shown.

BIN
PS文件/魏/WEI001曹操.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
PS文件/魏/WEI001曹操.psd (Stored with Git LFS)
View File

Binary file not shown.

3
README.md
View File

@ -58,6 +58,7 @@ Height 89.92 mm
祝融: "巨象"可以捡南蛮,自带+1. 祝融: "巨象"可以捡南蛮,自带+1.
荀彧: "节命"描述bug. 荀彧: "节命"描述bug.
<<<<<<< HEAD
公孙瓒: 字体间距.使用坐骑牌也能发动. 公孙瓒: 字体间距.使用坐骑牌也能发动.
庞德" "猛进"和公孙瓒做出区分. 庞德" "猛进"和公孙瓒做出区分.
曹操: "挥鞭"描述bug 曹操: "挥鞭"描述bug
@ -67,6 +68,8 @@ Height 89.92 mm
顾雍: "慎行"有概率摸牌. 顾雍: "慎行"有概率摸牌.
徐盛: "破军"附加移牌效果. 徐盛: "破军"附加移牌效果.
豹变牌: "挑衅"描述需要更新, 豹变牌: "挑衅"描述需要更新,
=======
>>>>>>> fuck
### 2020/01/10 ### 2020/01/10