2han9B1a0
|
39abbef905
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-06 18:38:11 +08:00 |
2han9B1a0
|
b0bee3f1d7
|
神将界面“全部”按钮
|
2020-07-06 18:37:29 +08:00 |
shihongyi
|
c9668c674c
|
Merge branch 'master' into master_develop
# Conflicts:
# .gitignore
|
2020-07-06 17:57:51 +08:00 |
shihongyi
|
6cee0b79fe
|
xunbaobug
|
2020-07-06 17:50:27 +08:00 |
shihongyi
|
d6e292caa6
|
Revert "tiangongtanbaobug"
This reverts commit d76752e426 .
|
2020-07-06 17:48:29 +08:00 |
shihongyi
|
d76752e426
|
tiangongtanbaobug
|
2020-07-06 17:47:25 +08:00 |
2han9B1a0
|
9c698254a7
|
删除 英雄、战斗界面的特权显示
|
2020-07-06 17:10:49 +08:00 |
2han9B1a0
|
e3c9fb459e
|
寻宝文字提示修改,特权界面资源替换
|
2020-07-06 17:01:50 +08:00 |
zhangqiang
|
4b8bae38b3
|
宝物分解界面提交
|
2020-07-06 16:27:27 +08:00 |
gaoxin
|
903cd68134
|
文件名修改
|
2020-07-06 11:59:53 +08:00 |
gaoxin
|
4508220751
|
bat文件添加
|
2020-07-06 11:58:59 +08:00 |
gaoxin
|
1251f17d4d
|
尝试命令行执行
|
2020-07-06 11:02:40 +08:00 |
gaoxin
|
5a2a3f83d2
|
excel 工具完善
|
2020-07-06 10:56:55 +08:00 |
skuld
|
ea3ed57c57
|
将每日抽卡上限修改回99999
|
2020-07-06 10:53:42 +08:00 |
gaoxin
|
d62d808e80
|
提交
|
2020-07-06 10:09:45 +08:00 |
gaoxin
|
608c296452
|
导表工具优化
|
2020-07-05 19:21:15 +08:00 |
zhangqiang
|
9053926e02
|
bug 点将台卡池预览,再查看四元阵卡池,显示的是点将台卡池
|
2020-07-04 17:04:26 +08:00 |
zhangqiang
|
608558d3cd
|
中文表 不提竞技场报错
|
2020-07-04 16:19:47 +08:00 |
zhangqiang
|
16bf6d9f7e
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-04 16:13:24 +08:00 |
zhangqiang
|
94a160d682
|
修改玩家信息时,应按照位置顺序显示该玩家主线阵容
|
2020-07-04 16:11:14 +08:00 |
gaoxin
|
55d52887a0
|
误删恢复
|
2020-07-04 15:34:30 +08:00 |
gaoxin
|
a7fcbbc722
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-04 15:32:38 +08:00 |
gaoxin
|
2552afa72e
|
忽略lua数据表文件
|
2020-07-04 15:32:09 +08:00 |
zhangqiang
|
385a8c86a1
|
bug 新手引导福利位置偏
|
2020-07-04 15:26:36 +08:00 |
zhangqiang
|
bc9dae0cff
|
漏提
|
2020-07-04 14:27:21 +08:00 |
zhangqiang
|
74830b4b90
|
开服狂欢奖励预览返回按钮不关闭预览bug
|
2020-07-04 14:24:30 +08:00 |
zhangqiang
|
4630199505
|
提交试试
|
2020-07-03 19:54:34 +08:00 |
gaoxin
|
9c7377e3d6
|
未命中效果添加
|
2020-07-03 18:55:45 +08:00 |
zhangqiang
|
ae8aa71edf
|
成员左右切换动画位置修改
|
2020-07-03 18:25:46 +08:00 |
2han9B1a0
|
f7c842eb9a
|
add zhushi
|
2020-07-03 17:59:10 +08:00 |
gaoxin
|
0bdb498338
|
添加全屏弹道按列区分释放位移
|
2020-07-03 16:50:14 +08:00 |
gaoxin
|
cf93ea3910
|
新技能资源添加
|
2020-07-03 16:48:33 +08:00 |
zhangqiang
|
f05d791a8b
|
Merge branch 'master_arena' of http://60.1.1.230/gaoxin/JL_Client into master_arena
|
2020-07-03 16:12:10 +08:00 |
zhangqiang
|
9c68ea0c73
|
巅峰战修改提交
|
2020-07-03 16:10:54 +08:00 |
2han9B1a0
|
e2c5b69f38
|
星级成长里bug修复
|
2020-07-03 16:02:57 +08:00 |
zhangqiang
|
dbd65fc321
|
添加忽略文件
|
2020-07-03 15:30:22 +08:00 |
gaoxin
|
9d56a77869
|
添加忽略文件
|
2020-07-03 12:03:14 +08:00 |
gaoxin
|
c704b826fb
|
Merge branch 'master' of http://60.1.1.230/gaoxin/JL_Client
|
2020-07-03 12:02:02 +08:00 |
gaoxin
|
fd78f2c333
|
添加忽略文件
|
2020-07-03 12:00:19 +08:00 |
zhangqiang
|
6f30179f57
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-07 13:33:51 +08:00 |
zhangqiang
|
70bbb3cee2
|
竞技场修改
|
2020-07-07 13:29:40 +08:00 |
JieLing
|
6a317d3f7b
|
测试热更0.15.25、svn逻辑同步
|
2020-07-03 11:52:23 +08:00 |
2han9B1a0
|
abfbfc423b
|
心魔文字修改、成长基金开启条件修改、文字:传说修改、四元阵卡池显示修改、自选宝箱提示修改
|
2020-07-03 11:27:25 +08:00 |
gaoxin
|
ab98e17e8a
|
添加判断命中的方法
|
2020-07-02 21:33:00 +08:00 |
gaoxin
|
d53bac2d5a
|
修复中毒死亡后依然可以释放技能
|
2020-07-02 21:02:59 +08:00 |
2han9B1a0
|
1796c48583
|
森罗幻境bug修改
|
2020-07-02 20:50:49 +08:00 |
gaoxin
|
5b5577d50b
|
添加全屏弹道技能
|
2020-07-02 19:23:42 +08:00 |
2han9B1a0
|
73c6cc9582
|
删除meta文件
|
2020-07-02 17:58:34 +08:00 |
gaoxin
|
00b12f3cee
|
无用文件删除
|
2020-07-02 17:25:32 +08:00 |
JieLing
|
e409bb2020
|
关闭红点显示
|
2020-07-02 17:05:21 +08:00 |