 45
|
041a064fc8
|
Merge pull request 'dev45-0328' (#100) from dev45-0328 into dev-1217
Reviewed-on: #100
|
10 months ago |
|
45
|
20d375fce8
|
合并冲突
|
10 months ago |
|
45
|
c9074dde01
|
开始加成点
|
10 months ago |
 yjm484
|
e9e6285431
|
Merge pull request '0402更新' (#99) from dev-0402-yjm into dev-1217
Reviewed-on: #99
|
10 months ago |
|
yjm484
|
4fb55f4ab7
|
0402更新
|
10 months ago |
|
45
|
dc2f4f0644
|
卡牌特殊触发框
|
10 months ago |
|
45
|
94051d8358
|
角色站立效果
|
10 months ago |
|
45
|
f3f3552312
|
Merge pull request 'dev45-0325' (#98) from dev45-0325 into dev-1217
Reviewed-on: #98
|
11 months ago |
|
45
|
1d7808a912
|
冲突合并
|
11 months ago |
|
45
|
08cd70d8e6
|
怪物意图攻击范围检测
|
11 months ago |
|
yjm484
|
d23f0c85b2
|
Merge pull request '高亮函数' (#97) from dev-0325-yjm into dev-1217
Reviewed-on: #97
|
11 months ago |
|
yjm484
|
9259b0ed3d
|
Merge branch 'dev-1217' into dev-0325-yjm
|
11 months ago |
|
yjm484
|
5bf9c36cda
|
高亮函数
|
11 months ago |
|
yjm484
|
e1d8b911eb
|
Merge pull request 'bug修复' (#96) from dev-0325-yjm into dev-1217
Reviewed-on: #96
|
11 months ago |
|
yjm484
|
45146c5ec0
|
Merge branch 'dev-1217' into dev-0325-yjm
|
11 months ago |
|
yjm484
|
bc935a47a5
|
bug修复
|
11 months ago |
|
45
|
22453be879
|
效果卡图
|
11 months ago |
|
45
|
e2df11c9ca
|
初步流程整合
|
11 months ago |
|
45
|
f0662b5dbc
|
涂色卡新版
|
11 months ago |
|
yjm484
|
0bc24741a3
|
Merge pull request '怪物修缮' (#95) from dev-0325-yjm into dev-1217
Reviewed-on: #95
|
11 months ago |
|
yjm484
|
b6e19d8f7a
|
建议多写重载
|
11 months ago |
|
yjm484
|
895dd3dac3
|
解决冲突
|
11 months ago |
|
yjm484
|
fa2a5eb40c
|
怪物修缮
|
11 months ago |
|
45
|
fbff2ef457
|
Merge pull request 'dev45-0318' (#94) from dev45-0318 into dev-1217
Reviewed-on: #94
|
11 months ago |
|
45
|
b0be303d8b
|
怪物意图描述
|
11 months ago |
|
45
|
295e8cd143
|
药水，遗物奖励
|
11 months ago |
|
45
|
e4525aafb2
|
Merge pull request '锻造奖励' (#93) from dev45-0316 into dev-1217
Reviewed-on: #93
|
11 months ago |
|
45
|
11968e3368
|
合并冲突
|
11 months ago |
|
45
|
8d255a617f
|
锻造奖励
|
11 months ago |
|
yjm484
|
c2f67afd62
|
Merge pull request '怪物修改1' (#92) from dev-0318-yjm into dev-1217
Reviewed-on: #92
|
11 months ago |
|
yjm484
|
3bf872366f
|
怪物修改1
|
11 months ago |
|
45
|
6ad74621a6
|
Merge pull request 'dev45-0310' (#91) from dev45-0310 into dev-1217
Reviewed-on: #91
|
11 months ago |
|
45
|
d46b666437
|
合并冲突0316
|
11 months ago |
|
45
|
0ba0a72b13
|
弃牌界面
|
11 months ago |
|
yjm484
|
27ec8ba409
|
Merge pull request '新怪物' (#90) from dev-0315-yjm1 into dev-1217
Reviewed-on: #90
|
11 months ago |
|
yjm484
|
774d4e1376
|
新怪物
|
11 months ago |
|
45
|
c9a8135727
|
效果锻造合并
|
11 months ago |
|
45
|
748982ace5
|
Merge pull request '卡牌描述超链接' (#89) from dev45-0304 into dev-1217
Reviewed-on: #89
|
11 months ago |
|
45
|
0ea9d2700a
|
合并
|
11 months ago |
|
45
|
8f4d5496e4
|
卡牌描述超链接
|
11 months ago |
|
yjm484
|
f4dcfe35b9
|
Merge pull request '卡牌锻造' (#88) from dev-0310-yjm into dev-1217
Reviewed-on: #88
|
11 months ago |
|
yjm484
|
d60d31186d
|
卡牌锻造
|
11 months ago |
|
45
|
2dd608b68d
|
Merge pull request 'dev45-0204' (#87) from dev45-0204 into dev-1217
Reviewed-on: #87
|
11 months ago |
|
45
|
30ec72826b
|
合并冲突
|
11 months ago |
|
45
|
6b40c8f75d
|
特效系统完善
|
11 months ago |
|
yjm484
|
62b43a21f6
|
Merge pull request '小Bugfix' (#84) from dev-0304-yjm1 into dev-1217
Reviewed-on: #84
|
11 months ago |
|
yjm484
|
7d80a1a9c8
|
Merge branch 'dev-1217' into dev-0304-yjm1
|
11 months ago |
|
yjm484
|
2d1d15db8c
|
Merge branch 'dev-0304-yjm1' of http://120.27.238.24:3000/cathouse/test_45 into dev-0304-yjm1
|
11 months ago |
|
yjm484
|
9ee8545a96
|
bugfix
|
11 months ago |
|
yjm484
|
85b134c23a
|
Merge pull request '更新卡牌描述' (#83) from dev-0304-yjm1 into dev-1217
Reviewed-on: #83
|
11 months ago |
