ZhangBiao
|
bc7e316531
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-18 16:19:19 +08:00 |
ZhangBiao
|
1c137cc911
|
【寻宝迷踪】骑着坐骑寻宝,特效显示分割线,需要修改
|
2021-10-18 16:18:59 +08:00 |
gaoxin
|
c9ccd9932b
|
【挚礼月卡】预制体修改
|
2021-10-18 15:28:43 +08:00 |
gaoxin
|
761f8d660c
|
【挚礼月卡】资源上传
|
2021-10-18 15:16:24 +08:00 |
jiaoyangna
|
022a7f46c6
|
天书秘卷没有秘卷时滑动修改提交
|
2021-10-18 11:53:09 +08:00 |
ZhangBiao
|
3d0e6a4be4
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
|
2021-10-18 11:35:58 +08:00 |
ZhangBiao
|
034d727a6f
|
【御剑行】提交
|
2021-10-18 11:32:06 +08:00 |
ZhangBiao
|
8f03ae0485
|
【御剑行】提交
|
2021-10-18 10:56:14 +08:00 |
wangzhenxing
|
35c1987c26
|
Merge branch '0功能/玉虚论道' into china/dev
|
2021-10-18 09:59:26 +08:00 |
wangzhenxing
|
c23a1e9bd0
|
赛季重置修改
|
2021-10-18 09:56:38 +08:00 |
wangzhenxing
|
23438def99
|
对战信息界面添加动效
|
2021-10-16 19:31:03 +08:00 |
wangzhenxing
|
23ed8a7a2b
|
【战斗】==========被动344添加空判断
|
2021-10-16 18:12:56 +08:00 |
wangzhenxing
|
267598d53b
|
Revert "【战斗】=======被动199"
This reverts commit c8603f010f .
|
2021-10-16 18:07:30 +08:00 |
jiaoyangna
|
c1cf0e4a79
|
牛气冲天进度显示修改
|
2021-10-16 17:59:38 +08:00 |
ZhangBiao
|
56067b59af
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-16 17:52:59 +08:00 |
ZhangBiao
|
381551df78
|
牛气冲天 神将升星添加进度
|
2021-10-16 17:52:50 +08:00 |
jiaoyangna
|
d0c9f01122
|
去掉log
|
2021-10-16 17:48:07 +08:00 |
wangzhenxing
|
c8603f010f
|
【战斗】=======被动199
|
2021-10-16 16:47:57 +08:00 |
ZhangBiao
|
27e433ca6b
|
【牛气冲天】增加进度
|
2021-10-16 16:37:44 +08:00 |
ZhangBiao
|
0aef47cc9f
|
【牛气冲天、灵兽宝阁】点击奖励显示错误修改
|
2021-10-16 16:00:34 +08:00 |
ZhangBiao
|
617a4f640b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-16 15:38:12 +08:00 |
ZhangBiao
|
e86a0c04a6
|
【乾坤宝盒】跳转进入乾坤宝盒界面,查看魂印特效穿透
|
2021-10-16 15:37:58 +08:00 |
wangzhenxing
|
61dddc3c02
|
段位变化展示修改提交
|
2021-10-16 15:27:03 +08:00 |
jiaoyangna
|
6917dc8e1c
|
背包神将碎片合成最大数量修改
|
2021-10-16 15:12:54 +08:00 |
ZhangBiao
|
45b9f3f3bb
|
【御剑行】增加特效
|
2021-10-16 15:08:29 +08:00 |
jiaoyangna
|
6cae26f8bb
|
红点位置修改提交
|
2021-10-16 14:48:18 +08:00 |
ZhangBiao
|
7e5f122a11
|
【适配】1080*2550 觉醒成功界面文字被切
|
2021-10-16 13:54:50 +08:00 |
ZhangBiao
|
1068806f6b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-16 13:45:58 +08:00 |
ZhangBiao
|
bd79f13e27
|
【连点】车迟斗法,十绝阵一类的玩法,快速点击进入战斗,会直接扣两个次数
|
2021-10-16 13:45:47 +08:00 |
wangzhenxing
|
c30f236943
|
阵容拖拽问题
|
2021-10-15 20:44:11 +08:00 |
wangzhenxing
|
20e70dfffb
|
进度条修改
|
2021-10-15 20:32:35 +08:00 |
wangzhenxing
|
08f87f8623
|
bug修改
|
2021-10-15 18:39:46 +08:00 |
jiaoyangna
|
aba4617fcd
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-15 18:07:21 +08:00 |
jiaoyangna
|
01fb1af93f
|
【ID1010483】
【优化】挂机界面,额外加成改为整数值,且更换资源文件
|
2021-10-15 18:07:07 +08:00 |
ZhangBiao
|
550ae985be
|
【牛气冲天】跳转提交
|
2021-10-15 17:52:05 +08:00 |
ZhangBiao
|
d76713abf2
|
【牛气冲天】更改标签顺序
|
2021-10-15 17:39:04 +08:00 |
ZhangBiao
|
3dca94f9aa
|
【牛气冲天】提交
|
2021-10-15 17:14:27 +08:00 |
ZhangBiao
|
4ccaca133e
|
【牛气冲天】修改提交
|
2021-10-15 16:49:00 +08:00 |
wangzhenxing
|
d1796fdab6
|
bug修改
|
2021-10-15 15:47:55 +08:00 |
ZhangBiao
|
08ea8c3be8
|
【御剑行】提交
|
2021-10-15 15:09:59 +08:00 |
ZhangBiao
|
a162e6aa64
|
【御剑行】
|
2021-10-15 14:50:59 +08:00 |
ZhangBiao
|
decf1b869c
|
【御剑行】提交
|
2021-10-15 14:47:14 +08:00 |
jiaoyangna
|
e026881024
|
ID1010484】
易经宝库可选奖励优化
|
2021-10-15 14:35:57 +08:00 |
ZhangBiao
|
e43abf17b2
|
【御剑行】提交
|
2021-10-15 14:14:04 +08:00 |
ZhangBiao
|
a16b8c5e75
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
|
2021-10-15 14:06:35 +08:00 |
ZhangBiao
|
11bf1918dc
|
【御剑行】提交问好
|
2021-10-15 14:06:18 +08:00 |
ZhangBiao
|
cbef4e021b
|
【御剑行】提交
|
2021-10-15 14:02:33 +08:00 |
jiaoyangna
|
3bb3e41f09
|
bat Resource Commit:2021/10/15,14:02:03
|
2021-10-15 14:02:03 +08:00 |
jiaoyangna
|
dafa14ffb0
|
坐骑资源修改提交
|
2021-10-15 13:44:49 +08:00 |
ZhangBiao
|
132dc11c6b
|
【御剑行】提交
|
2021-10-15 13:33:58 +08:00 |