 45
|
753fa07dde
|
ui替换0609
|
7 months ago |
|
软件204张景程
|
2bc41bc235
|
数据同步0609
|
7 months ago |
|
45
|
953f285c72
|
Merge pull request 'dev45-0528' (#125) from dev45-0528 into dev-1217
Reviewed-on: #125
|
7 months ago |
 yjm484
|
4de97239fc
|
Merge pull request '0530提交' (#124) from dev-0530-yjm into dev-1217
Reviewed-on: #124
|
7 months ago |
|
yjm484
|
62f1b74045
|
0530提交
|
7 months ago |
|
45
|
a1909ec63a
|
ui替换0529
|
7 months ago |
|
45
|
9c9e79a341
|
bug修理0528
|
7 months ago |
|
45
|
e9d9ddbf0e
|
Merge pull request 'dev45-0521' (#123) from dev45-0521 into dev-1217
Reviewed-on: #123
|
7 months ago |
|
45
|
1c192e796a
|
流程修理0527
|
7 months ago |
|
45
|
60719fc31c
|
效果锻造改版0526
|
7 months ago |
|
yjm484
|
6e06cc2991
|
Merge pull request 'bug修复' (#122) from dev-0520-yjm1 into dev-1217
Reviewed-on: #122
|
7 months ago |
|
yjm484
|
f99a20c886
|
bug修复
|
7 months ago |
|
45
|
1e40b6fea8
|
Merge pull request '涂色卡锻造效果替换0520' (#121) from dev45-0520 into dev-1217
Reviewed-on: #121
|
7 months ago |
|
45
|
a3fff39284
|
涂色卡锻造效果替换0520
|
7 months ago |
|
45
|
d8b03ba249
|
Merge pull request '场景按钮ui替换' (#120) from dev45-0516 into dev-1217
Reviewed-on: #120
|
7 months ago |
|
45
|
9b8fc3a335
|
合并冲突0520
|
7 months ago |
|
yjm484
|
ac5700460b
|
Merge pull request '0520更新' (#119) from dev-0513-yjm into dev-1217
Reviewed-on: #119
|
7 months ago |
|
yjm484
|
7b68fb6b39
|
Merge branch 'dev-1217' into dev-0513-yjm
|
7 months ago |
|
yjm484
|
b11ca502ec
|
0520更新
|
7 months ago |
|
45
|
0e506cac47
|
场景按钮ui替换
|
7 months ago |
|
yjm484
|
788367f1d7
|
Merge pull request '0516修正' (#118) from dev-0513-yjm into dev-1217
Reviewed-on: #118
|
7 months ago |
|
yjm484
|
8fd0c09fec
|
解决冲突2
|
7 months ago |
|
yjm484
|
d88de8a2fe
|
解决冲突
|
7 months ago |
|
yjm484
|
c907f74f98
|
0516修正
|
7 months ago |
|
yjm484
|
5be08eaaa1
|
合并
|
7 months ago |
|
45
|
8c3172edf9
|
Merge pull request 'dev45-0513' (#117) from dev45-0513 into dev-1217
Reviewed-on: #117
|
7 months ago |
|
45
|
5011ab2685
|
流程完善0515
|
7 months ago |
|
45
|
c227fc2856
|
局内跳转0514
|
7 months ago |
|
yjm484
|
40bc6790a5
|
Merge remote-tracking branch 'origin/dev-1217' into dev-0513-yjm
|
7 months ago |
|
yjm484
|
5c71b558cd
|
Merge branch 'dev-1217' into dev-0513-yjm
|
7 months ago |
|
yjm484
|
899213d478
|
药水掉落修复
|
7 months ago |
|
45
|
a870588f7a
|
Merge pull request '药水报错空过' (#116) from dev45-0513 into dev-1217
Reviewed-on: #116
|
7 months ago |
|
45
|
e75b568f9b
|
药水报错空过
|
7 months ago |
|
45
|
b9b8a6c050
|
Merge pull request '预涂色修复0513' (#115) from dev45-0507 into dev-1217
Reviewed-on: #115
|
7 months ago |
|
45
|
50a38f3cc4
|
合并冲突0513
|
7 months ago |
|
yjm484
|
94ec3d0c4d
|
Merge pull request '0513提交' (#114) from dev-0513-yjm into dev-1217
Reviewed-on: #114
|
7 months ago |
|
yjm484
|
1883d17a2c
|
0513提交
|
7 months ago |
|
45
|
428e1af227
|
预涂色修复0513
|
7 months ago |
|
45
|
1bf6950099
|
Merge pull request 'ui替换0506_2' (#113) from dev45-0501 into dev-1217
Reviewed-on: #113
|
8 months ago |
|
45
|
52a61009a9
|
ui替换0506_2
|
8 months ago |
|
45
|
a8ea2f581d
|
Merge pull request 'ui替换0506' (#112) from dev45-0501 into dev-1217
Reviewed-on: #112
|
8 months ago |
|
45
|
30d0a5ce7a
|
ui替换0506
|
8 months ago |
|
45
|
7b0fe003d9
|
Merge pull request 'dev45-0425' (#111) from dev45-0425 into dev-1217
Reviewed-on: #111
|
8 months ago |
|
45
|
f4c7be9c75
|
冲突合并0501
|
8 months ago |
|
45
|
06fd96a8b8
|
ui替换0501
|
8 months ago |
|
yjm484
|
e845cce6e3
|
Merge pull request '0501提交' (#109) from dev-0501-yjm into dev-1217
Reviewed-on: #109
|
8 months ago |
|
yjm484
|
763a1170d9
|
0501提交
|
8 months ago |
|
45
|
795bbb85b9
|
ui替换0429
|
8 months ago |
|
45
|
db7a069fa5
|
Merge pull request '怪物信息板优化，用id抽取卡牌实现复制' (#108) from dev45-0418 into dev-1217
Reviewed-on: #108
|
8 months ago |
|
45
|
60666b5484
|
冲突合并0425
|
8 months ago |
