 yjm484
|
a8aff8ff3d
|
turnmaster的反转
|
7 months ago |
|
yjm484
|
5ce648ca42
|
删除playerOn和卡牌相关
|
7 months ago |
 45
|
aabfdb8a38
|
Merge pull request 'dev45-0705' (#139) from dev45-0705 into dev45-0703NewVer
Reviewed-on: #139
|
7 months ago |
|
45
|
14cad7ad7a
|
合并0705
|
7 months ago |
|
45
|
8bfc30c1e5
|
Merge pull request '0705提交' (#138) from dev-1217-0703yjm into dev45-0705
Reviewed-on: #138
|
7 months ago |
|
45
|
d420698b72
|
Merge branch 'dev45-0705' into dev-1217-0703yjm
|
7 months ago |
|
yjm484
|
5531bcfab9
|
0705提交
|
7 months ago |
|
45
|
632acc2b53
|
商店ui0704
|
7 months ago |
|
45
|
007129daac
|
Merge pull request 'dev45-0626' (#137) from dev45-0626 into dev-1217
Reviewed-on: #137
|
7 months ago |
|
45
|
e1532dabf9
|
ui替换0703
|
7 months ago |
|
45
|
de9aa37cc8
|
商店ui替换0702
|
7 months ago |
|
45
|
a5e43a09eb
|
Merge pull request 'ui替换0628' (#135) from dev45-0626 into dev-1217
Reviewed-on: #135
|
7 months ago |
|
45
|
d6b76a9ed6
|
ui替换0628
|
7 months ago |
|
yjm484
|
41811c701b
|
Merge pull request '0625提交' (#134) from dev-0624-yjm into dev-1217
Reviewed-on: #134
|
8 months ago |
|
yjm484
|
3113c5e4ce
|
Merge branch 'dev-1217' into dev-0624-yjm
|
8 months ago |
|
yjm484
|
15770290d1
|
0625提交
|
8 months ago |
|
yjm484
|
c69faa10e6
|
Merge pull request '0624更新' (#133) from dev-0624-yjm into dev-1217
Reviewed-on: #133
|
8 months ago |
|
yjm484
|
d876feadcf
|
修正冲突
|
8 months ago |
|
yjm484
|
cf490776ac
|
0624更像
|
8 months ago |
|
45
|
4e8066d95e
|
Merge pull request 'dev45-0618' (#132) from dev45-0618 into dev-1217
Reviewed-on: #132
|
8 months ago |
|
45
|
732c4e66d7
|
ui替换0623
|
8 months ago |
|
45
|
7da213a4ad
|
ui替换0622
|
8 months ago |
|
45
|
f8f100c9eb
|
Merge pull request 'bug修缮0617' (#131) from dev45-0612 into dev-1217
Reviewed-on: #131
|
8 months ago |
|
45
|
0e518189e5
|
bug修缮0617
|
8 months ago |
|
45
|
701c47d2b9
|
Merge pull request '特效替换0612' (#130) from dev45-0612 into dev-1217
Reviewed-on: #130
|
8 months ago |
|
45
|
cb57423b8f
|
特效替换0612
|
8 months ago |
|
45
|
8095a9a031
|
Merge pull request 'dev45-0603' (#129) from dev45-0603 into dev-1217
Reviewed-on: #129
|
8 months ago |
|
45
|
dadab3e3eb
|
合并冲突0612
|
8 months ago |
|
45
|
fcacf276e5
|
特效场景0612
|
8 months ago |
|
yjm484
|
007ae8110a
|
Merge pull request '0612提交' (#126) from dev-0612-yjm into dev-1217
Reviewed-on: #126
|
8 months ago |
|
yjm484
|
b4db53b544
|
0612提交
|
8 months ago |
|
45
|
abca02672b
|
ui替换0609_2
|
8 months ago |
|
45
|
753fa07dde
|
ui替换0609
|
8 months ago |
|
软件204张景程
|
2bc41bc235
|
数据同步0609
|
8 months ago |
|
45
|
953f285c72
|
Merge pull request 'dev45-0528' (#125) from dev45-0528 into dev-1217
Reviewed-on: #125
|
8 months ago |
|
yjm484
|
4de97239fc
|
Merge pull request '0530提交' (#124) from dev-0530-yjm into dev-1217
Reviewed-on: #124
|
8 months ago |
|
yjm484
|
62f1b74045
|
0530提交
|
8 months ago |
|
45
|
a1909ec63a
|
ui替换0529
|
8 months ago |
|
45
|
9c9e79a341
|
bug修理0528
|
8 months ago |
|
45
|
e9d9ddbf0e
|
Merge pull request 'dev45-0521' (#123) from dev45-0521 into dev-1217
Reviewed-on: #123
|
9 months ago |
|
45
|
1c192e796a
|
流程修理0527
|
9 months ago |
|
45
|
60719fc31c
|
效果锻造改版0526
|
9 months ago |
|
yjm484
|
6e06cc2991
|
Merge pull request 'bug修复' (#122) from dev-0520-yjm1 into dev-1217
Reviewed-on: #122
|
9 months ago |
|
yjm484
|
f99a20c886
|
bug修复
|
9 months ago |
|
45
|
1e40b6fea8
|
Merge pull request '涂色卡锻造效果替换0520' (#121) from dev45-0520 into dev-1217
Reviewed-on: #121
|
9 months ago |
|
45
|
a3fff39284
|
涂色卡锻造效果替换0520
|
9 months ago |
|
45
|
d8b03ba249
|
Merge pull request '场景按钮ui替换' (#120) from dev45-0516 into dev-1217
Reviewed-on: #120
|
9 months ago |
|
45
|
9b8fc3a335
|
合并冲突0520
|
9 months ago |
|
yjm484
|
ac5700460b
|
Merge pull request '0520更新' (#119) from dev-0513-yjm into dev-1217
Reviewed-on: #119
|
9 months ago |
|
yjm484
|
7b68fb6b39
|
Merge branch 'dev-1217' into dev-0513-yjm
|
9 months ago |
