 45
|
7b0fe003d9
|
Merge pull request 'dev45-0425' (#111) from dev45-0425 into dev-1217
Reviewed-on: #111
|
9 months ago |
|
45
|
f4c7be9c75
|
冲突合并0501
|
9 months ago |
|
45
|
06fd96a8b8
|
ui替换0501
|
9 months ago |
 yjm484
|
e845cce6e3
|
Merge pull request '0501提交' (#109) from dev-0501-yjm into dev-1217
Reviewed-on: #109
|
9 months ago |
|
yjm484
|
763a1170d9
|
0501提交
|
9 months ago |
|
45
|
795bbb85b9
|
ui替换0429
|
9 months ago |
|
45
|
db7a069fa5
|
Merge pull request '怪物信息板优化，用id抽取卡牌实现复制' (#108) from dev45-0418 into dev-1217
Reviewed-on: #108
|
10 months ago |
|
45
|
60666b5484
|
冲突合并0425
|
10 months ago |
|
45
|
91ebe71e91
|
怪物信息板优化，用id抽取卡牌实现复制
|
10 months ago |
|
yjm484
|
041471ab0f
|
Merge pull request '0425提交' (#107) from dev-0425-yjm into dev-1217
Reviewed-on: #107
|
10 months ago |
|
yjm484
|
f1ae7e18ff
|
excel修改
|
10 months ago |
|
yjm484
|
889ac3fd3b
|
0425提交
|
10 months ago |
|
45
|
3fb782e114
|
Merge pull request 'dev45-0414' (#106) from dev45-0414 into dev-1217
Reviewed-on: #106
|
10 months ago |
|
45
|
ef84ff8ec7
|
合并冲突0418
|
10 months ago |
|
yjm484
|
a8d789486d
|
Merge pull request '0418提交' (#105) from dev-0418-yjm into dev-1217
Reviewed-on: #105
|
10 months ago |
|
yjm484
|
d5af6ce40b
|
0418提交
|
10 months ago |
|
45
|
c9f959c2d8
|
范围边界优化
|
10 months ago |
|
45
|
7a87f3f933
|
bug修改
|
10 months ago |
|
45
|
2cd80574dd
|
Merge pull request 'dev45-0407' (#104) from dev45-0407 into dev-1217
Reviewed-on: #104
|
10 months ago |
|
45
|
ef15819ca6
|
合并冲突0414
|
10 months ago |
|
45
|
c2c951af5b
|
ui选中效果
|
10 months ago |
|
yjm484
|
d5b7c7b5ed
|
Merge pull request '能力卡和bugfix' (#103) from dev-0414-yjm into dev-1217
Reviewed-on: #103
|
10 months ago |
|
yjm484
|
145ce60c2d
|
能力卡和bugfix
|
10 months ago |
|
45
|
a19f6362a5
|
卡牌框特效
|
10 months ago |
|
yjm484
|
8f06d71753
|
卡牌锻造bug修复
|
10 months ago |
|
yjm484
|
3e31fbd6bc
|
卡牌锻造bug修复
|
10 months ago |
|
45
|
ff4fa30c92
|
数据库配置文件
|
10 months ago |
|
45
|
8f48a1ed69
|
玩家属性修改
|
10 months ago |
|
yjm484
|
c42cb3a8f0
|
冲突修改
|
10 months ago |
|
45
|
fd0f712e21
|
Merge pull request 'dev45-0402' (#102) from dev45-0402 into dev-1217
Reviewed-on: #102
|
10 months ago |
|
45
|
52107035f8
|
丢牌文字描述
|
10 months ago |
|
yjm484
|
ad6f9cc492
|
Merge pull request '0407更新' (#101) from dev-0407-yjm into dev-1217
Reviewed-on: #101
|
10 months ago |
|
yjm484
|
897f901b12
|
0407更新
|
10 months ago |
|
45
|
9e995455f6
|
ui替换
|
10 months ago |
|
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 |
