Compare commits

..

No commits in common. "043285dbbba621975a11de0f6a98d27a27dcbdda" and "d1e5f1619257ddd1e8fbdb23257bcab35a6063fc" have entirely different histories.

5 changed files with 8 additions and 11 deletions

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

View File

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