 45
|
6ad74621a6
|
Merge pull request 'dev45-0310' (#91) from dev45-0310 into dev-1217
Reviewed-on: #91
|
9 months ago |
|
45
|
d46b666437
|
合并冲突0316
|
9 months ago |
|
45
|
0ba0a72b13
|
弃牌界面
|
9 months ago |
 yjm484
|
27ec8ba409
|
Merge pull request '新怪物' (#90) from dev-0315-yjm1 into dev-1217
Reviewed-on: #90
|
9 months ago |
|
yjm484
|
774d4e1376
|
新怪物
|
9 months ago |
|
45
|
c9a8135727
|
效果锻造合并
|
10 months ago |
|
45
|
748982ace5
|
Merge pull request '卡牌描述超链接' (#89) from dev45-0304 into dev-1217
Reviewed-on: #89
|
10 months ago |
|
45
|
0ea9d2700a
|
合并
|
10 months ago |
|
45
|
8f4d5496e4
|
卡牌描述超链接
|
10 months ago |
|
yjm484
|
f4dcfe35b9
|
Merge pull request '卡牌锻造' (#88) from dev-0310-yjm into dev-1217
Reviewed-on: #88
|
10 months ago |
|
yjm484
|
d60d31186d
|
卡牌锻造
|
10 months ago |
|
45
|
2dd608b68d
|
Merge pull request 'dev45-0204' (#87) from dev45-0204 into dev-1217
Reviewed-on: #87
|
10 months ago |
|
45
|
30ec72826b
|
合并冲突
|
10 months ago |
|
45
|
6b40c8f75d
|
特效系统完善
|
10 months ago |
|
yjm484
|
62b43a21f6
|
Merge pull request '小Bugfix' (#84) from dev-0304-yjm1 into dev-1217
Reviewed-on: #84
|
10 months ago |
|
yjm484
|
7d80a1a9c8
|
Merge branch 'dev-1217' into dev-0304-yjm1
|
10 months ago |
|
yjm484
|
2d1d15db8c
|
Merge branch 'dev-0304-yjm1' of http://120.27.238.24:3000/cathouse/test_45 into dev-0304-yjm1
|
10 months ago |
|
yjm484
|
9ee8545a96
|
bugfix
|
10 months ago |
|
yjm484
|
85b134c23a
|
Merge pull request '更新卡牌描述' (#83) from dev-0304-yjm1 into dev-1217
Reviewed-on: #83
|
10 months ago |
|
yjm484
|
572fb5cde6
|
Merge branch 'dev-1217' into dev-0304-yjm1
|
10 months ago |
|
yjm484
|
973f81b571
|
更新卡牌描述
|
10 months ago |
|
45
|
728bd24594
|
火焰攻击动效
|
10 months ago |
|
45
|
bd8d4cd9ec
|
地块改色优化
|
10 months ago |
|
yjm484
|
a96a1ca2eb
|
Merge pull request 'dev45-0204' (#82) from dev45-0204 into dev-1217
Reviewed-on: #82
|
10 months ago |
|
yjm484
|
972201e645
|
Merge branch 'dev-1217' into dev45-0204
|
10 months ago |
|
yjm484
|
b34797c4e7
|
Merge pull request '版本更新' (#81) from dev-0228-yjm1 into dev45-0204
Reviewed-on: #81
|
10 months ago |
|
yjm484
|
fc02281b76
|
修改冲突
|
10 months ago |
|
yjm484
|
b64f5b0113
|
版本更新
|
10 months ago |
|
45
|
fd8b5e61db
|
Merge pull request 'dev45-0204' (#80) from dev45-0204 into dev-1217
Reviewed-on: #80
|
10 months ago |
|
45
|
2368a8ec12
|
地块泛光和优化
|
10 months ago |
|
45
|
13070b9ff4
|
临时地块替换
|
10 months ago |
|
45
|
4af5cfe8d6
|
素材替换
|
10 months ago |
|
软件204张景程
|
9a8b12ddab
|
事件填充完成，新事件类型
|
10 months ago |
|
软件204张景程
|
7c1e40e0d6
|
事件填充，战斗ui替换
|
10 months ago |
|
软件204张景程
|
12b9a7dae9
|
药水系统
|
10 months ago |
|
软件204张景程
|
9c3c7ead7e
|
商店更新
|
11 months ago |
|
软件204张景程
|
bacd8c3d14
|
地图节点
|
11 months ago |
|
软件204张景程
|
3e0194b6ed
|
屏蔽卡牌射程UI
|
11 months ago |
|
软件204张景程
|
ed0c4e3c02
|
卡牌发动优化，锻造优化
|
11 months ago |
|
软件204张景程
|
8a80ecb2b1
|
卡牌发动判断，锻造系统优化
|
11 months ago |
|
软件204张景程
|
ff1f35ce0b
|
卡牌边框发光
|
11 months ago |
|
软件204张景程
|
668eb39cdc
|
资源迁移
|
11 months ago |
|
45
|
cc662edc80
|
Merge pull request '小bug修改' (#79) from dev45-0117 into dev-1217
Reviewed-on: #79
|
11 months ago |
|
45
|
038cb9d0b2
|
小bug修改
|
11 months ago |
|
45
|
e7ac20b6e7
|
Merge pull request 'dev45-0117' (#78) from dev45-0117 into dev-1217
Reviewed-on: #78
|
11 months ago |
|
45
|
991b708602
|
合并冲突
|
11 months ago |
|
45
|
f36e91ac3b
|
锻造系统改色范围
|
11 months ago |
|
yjm484
|
9ea97ef018
|
Merge pull request '0121提交' (#77) from dev-1217-yjm0121 into dev-1217
Reviewed-on: #77
|
11 months ago |
|
yjm484
|
9fa13345ff
|
0121提交
|
11 months ago |
|
45
|
db62137a95
|
锻造系统UI
|
11 months ago |
