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 |
jiaoyangna
|
234c17cfe4
|
挂机奖励预览四舍五入显示
(cherry picked from commit 09ef1c8981)
|
2021-10-15 12:13:47 +08:00 |
jiaoyangna
|
2ed7770259
|
排行榜上小人方向修改
(cherry picked from commit 35e0b7e419)
|
2021-10-15 12:13:37 +08:00 |
jiaoyangna
|
3e616a0462
|
排行榜上小人方向修改
(cherry picked from commit f31f62ec09)
|
2021-10-15 12:13:28 +08:00 |
jiaoyangna
|
83ceaa43b7
|
排行榜上小人朝侧面修改提交
(cherry picked from commit 851bd2450c)
|
2021-10-15 12:13:14 +08:00 |
jiaoyangna
|
09ef1c8981
|
挂机奖励预览四舍五入显示
|
2021-10-15 12:12:38 +08:00 |
jiaoyangna
|
35e0b7e419
|
排行榜上小人方向修改
|
2021-10-15 11:53:16 +08:00 |
jiaoyangna
|
f31f62ec09
|
排行榜上小人方向修改
|
2021-10-15 11:51:38 +08:00 |
jiaoyangna
|
851bd2450c
|
排行榜上小人朝侧面修改提交
|
2021-10-15 11:40:01 +08:00 |
ZhangBiao
|
35eb36384e
|
【御剑行】提交
|
2021-10-15 11:15:42 +08:00 |
jiaoyangna
|
450d426232
|
Merge branch 'china/dev' into 0功能/玉虚论道
|
2021-10-15 10:05:22 +08:00 |
jiaoyangna
|
7ac2417ff8
|
【ID1010479】
天书秘卷调整
|
2021-10-15 09:54:12 +08:00 |
wangzhenxing
|
474549ea24
|
bug修改
|
2021-10-14 21:36:29 +08:00 |
wangzhenxing
|
444f8259ee
|
玉虚论道主界面请求添加类型
|
2021-10-14 21:30:35 +08:00 |
jiaoyangna
|
f852ba73ed
|
长按赠完礼物时多提示一次礼物数量不足
|
2021-10-14 20:39:37 +08:00 |
jiaoyangna
|
8c95ee03e9
|
【ID1010479】
天书秘卷调整
|
2021-10-14 20:18:02 +08:00 |
jiaoyangna
|
101f406a4c
|
【ID1010469】
好感度优化
|
2021-10-14 20:15:53 +08:00 |
ZhangBiao
|
2fda9c77ff
|
【御剑行】提交
|
2021-10-14 19:57:40 +08:00 |
lihaiyang
|
5fbc4458c4
|
bat Resource Commit:2021/10/14,18:40:50
|
2021-10-14 18:40:50 +08:00 |
ZhangBiao
|
4d911a4ea4
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
|
2021-10-14 18:28:55 +08:00 |
ZhangBiao
|
6ebe5720a6
|
【御剑行】红点提交
|
2021-10-14 18:28:27 +08:00 |
jiaoyangna
|
b886c7024c
|
坐骑资源提交
|
2021-10-14 18:15:07 +08:00 |
ZhangBiao
|
46d38b01ec
|
【御剑行】提交
|
2021-10-14 18:02:30 +08:00 |
jiaoyangna
|
3b5772be75
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-14 17:15:53 +08:00 |
jiaoyangna
|
ae3f783689
|
神将天赋修改提交
|
2021-10-14 17:15:20 +08:00 |
jiaoyangna
|
9e46ffd910
|
神将天赋界面修改提交
|
2021-10-14 17:14:51 +08:00 |
wangzhenxing
|
fbb1c387c7
|
【战斗】=======伤害公式 修改 去点 防御0.5的容错
|
2021-10-14 17:12:01 +08:00 |
ZhangBiao
|
cd04fc3d37
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
|
2021-10-14 17:11:12 +08:00 |
ZhangBiao
|
4b6079d4e8
|
【御剑行】提价
|
2021-10-14 17:10:40 +08:00 |
jiaoyangna
|
bbd9c9e1c2
|
坐骑方向调整
|
2021-10-14 16:37:09 +08:00 |
wangzhenxing
|
072c44d495
|
[bug]======【ID1018713】
【成就】战力目标成就进度超框,需要改为缩写
|
2021-10-14 16:35:34 +08:00 |
ZhangBiao
|
5a4a42594d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-14 16:17:25 +08:00 |
ZhangBiao
|
b08af858a9
|
【牛气冲天】提交
|
2021-10-14 16:16:52 +08:00 |
ZhangBiao
|
67026aa355
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2021-10-14 16:13:07 +08:00 |
ZhangBiao
|
8ad554a64d
|
【御剑行】提交
|
2021-10-14 16:10:54 +08:00 |
wangzhenxing
|
66c50b6731
|
添加屏蔽,点挑战后不能再拖动
|
2021-10-14 15:48:30 +08:00 |
wangzhenxing
|
25bce8b8d4
|
bug修改提交
|
2021-10-14 15:38:47 +08:00 |
ZhangBiao
|
3d1a5ebd4c
|
【御剑行】提交
|
2021-10-14 15:30:46 +08:00 |
jiaoyangna
|
f964d2a10c
|
添加,缩短魂印名字
|
2021-10-14 15:16:14 +08:00 |
jiaoyangna
|
204aba3fde
|
缩短魂印名字
|
2021-10-14 15:14:07 +08:00 |
jiaoyangna
|
ac0221b89f
|
白金装备修改提交
|
2021-10-14 15:05:36 +08:00 |
jiaoyangna
|
ad9ee953dc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-14 14:13:16 +08:00 |
jiaoyangna
|
ea342f1916
|
装备篇资源提交
|
2021-10-14 14:13:03 +08:00 |
wangzhenxing
|
f0fcd144f2
|
[战斗]===========被动添加 354 355
|
2021-10-14 13:54:07 +08:00 |
jiaoyangna
|
842c9b7592
|
白金装备属性加成添加
|
2021-10-14 12:39:40 +08:00 |
jiaoyangna
|
8b4f447466
|
坐骑立绘提交
|
2021-10-14 12:15:20 +08:00 |
jiaoyangna
|
3cbffeab4a
|
【ID1010437】
【优化】开服玉帝御剑坐骑活动
|
2021-10-14 12:14:26 +08:00 |
jiaoyangna
|
4f580146bd
|
【ID1010465】
增加白金装备图鉴
|
2021-10-14 12:01:55 +08:00 |
ZhangBiao
|
4eb6e1d9ae
|
【御剑行】提交
|
2021-10-14 11:25:44 +08:00 |
ZhangBiao
|
2101e974ad
|
【御剑行】增加投注滑动条
|
2021-10-14 09:53:51 +08:00 |
ZhangBiao
|
81166ae892
|
【牛气冲天】修改,待后端修改数据,待增加新活动类型
|
2021-10-13 19:43:25 +08:00 |
wangzhenxing
|
7dce99c08c
|
玉虚修改
|
2021-10-13 19:35:30 +08:00 |
ZhangBiao
|
bb9533781d
|
【御剑行】提交
|
2021-10-13 19:15:39 +08:00 |
ZhangBiao
|
414ab1f3d9
|
【御剑行】提交
|
2021-10-13 17:38:32 +08:00 |
ZhangBiao
|
018c09d69c
|
【御剑行】竞猜,差一个三级弹窗
|
2021-10-13 17:30:26 +08:00 |
liujiaqi
|
b24cd4e168
|
【资源】敬请期待
|
2021-10-13 16:33:42 +08:00 |
yuanshuai
|
dd56c24ae8
|
点金前端显示bug修改
|
2021-10-13 16:02:23 +08:00 |
wangzhenxing
|
ee434c85cc
|
结算界面名字显示修改
|
2021-10-13 15:45:42 +08:00 |
ZhangBiao
|
6870073129
|
【御剑行】排行完成
|
2021-10-13 15:39:47 +08:00 |
wangzhenxing
|
5b41289cd0
|
玉虚论道阵容界面修改
|
2021-10-13 15:26:12 +08:00 |
wangzhenxing
|
1ad72ca981
|
红点检测修改
|
2021-10-12 20:41:57 +08:00 |
wangzhenxing
|
e9b740510f
|
红点修改
|
2021-10-12 20:21:54 +08:00 |
wangzhenxing
|
2237084155
|
Merge branch 'china/dev' into 0功能/玉虚论道
Conflicts:
Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-10-12 20:08:46 +08:00 |
wangzhenxing
|
e28ca0087f
|
红点提交
|
2021-10-12 19:50:41 +08:00 |
jiaoyangna
|
1495f42672
|
好感度特效修改提交
|
2021-10-12 18:35:17 +08:00 |
wangzhenxing
|
a1f3f67bed
|
我的队伍信息英雄下方序号修改
|
2021-10-12 18:28:46 +08:00 |
jiaoyangna
|
686d9345f4
|
长按赠送道具数量不变修改
|
2021-10-12 18:01:39 +08:00 |
jiaoyangna
|
25f3f927d6
|
位置修改提交
|
2021-10-12 17:51:04 +08:00 |
ZhangBiao
|
9604225256
|
【御剑行】可以完成循环_提交
|
2021-10-12 17:21:46 +08:00 |
jiaoyangna
|
134e52feeb
|
赠予抖动修改提交
|
2021-10-12 17:17:16 +08:00 |
jiaoyangna
|
0740005166
|
好感度位置修改提交
|
2021-10-12 17:09:58 +08:00 |
wangzhenxing
|
7a83198c6f
|
播放战斗对碰时添加按钮屏蔽
|
2021-10-12 16:39:58 +08:00 |
jiaoyangna
|
3f92309d78
|
好感度添加特效
|
2021-10-12 16:33:10 +08:00 |
wangzhenxing
|
89216b64a5
|
玉虚队伍战斗显示不一致修改
|
2021-10-12 16:13:19 +08:00 |
ZhangBiao
|
533bd25780
|
【御剑行】提交
|
2021-10-12 15:53:57 +08:00 |
jiaoyangna
|
262aa7a7e7
|
装备界面适配修改提交
(cherry picked from commit 45d29ef264)
(cherry picked from commit edfe797ddd)
|
2021-10-12 15:51:32 +08:00 |
wangzhenxing
|
c4d7edc289
|
玉虚bug修改
|
2021-10-12 15:33:39 +08:00 |
jiaoyangna
|
60b53f2d7b
|
神将详情,装备修改提交
|
2021-10-12 15:32:07 +08:00 |
jiaoyangna
|
e70329e605
|
神将详情显示错误修改
|
2021-10-12 14:54:12 +08:00 |
jiaoyangna
|
e7cfacdccd
|
神奖详情界面修改提交
|
2021-10-12 14:26:19 +08:00 |
jiaoyangna
|
79e751197f
|
战力不一致修改提交
|
2021-10-12 13:20:24 +08:00 |
jiaoyangna
|
b0f9b28036
|
神将详情报错修改提交
|
2021-10-12 12:17:33 +08:00 |
jiaoyangna
|
1a165839fd
|
点击神将详情界面查看属性按钮报错修改必现
|
2021-10-12 12:16:31 +08:00 |
wangzhenxing
|
1b2c8cc693
|
回方添加战斗力显示,解决青铜1升青铜2 进度条时间太长问题
|
2021-10-12 11:51:43 +08:00 |
ZhangBiao
|
359ca6b299
|
【御剑行】提交
|
2021-10-12 11:26:48 +08:00 |
wangzhenxing
|
4317d1df54
|
奖励显示修改
|
2021-10-12 10:27:49 +08:00 |
jiaoyangna
|
fb0aec52e6
|
好感度优化
|
2021-10-12 10:05:10 +08:00 |
wangzhenxing
|
2f31f6c588
|
上阵界面排序修改
|
2021-10-12 10:03:20 +08:00 |
wangzhenxing
|
d2c2b39b8b
|
[战斗]==========被动312修改
|
2021-10-11 17:46:01 +08:00 |
ZhangBiao
|
99d80454f5
|
【御剑行】增加开始动画
|
2021-10-11 17:25:48 +08:00 |
wangzhenxing
|
d8a0a0e8c1
|
玉虚提交
|
2021-10-11 16:30:33 +08:00 |
jiaoyangna
|
457b40b1e2
|
点击报错修改
|
2021-10-11 15:25:55 +08:00 |
jiaoyangna
|
4a338b9d4c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-11 15:15:50 +08:00 |
jiaoyangna
|
750f4afaef
|
ID1010436】
【优化】好感度增加通用礼物 及界面优化
|
2021-10-11 15:15:34 +08:00 |
ZhangBiao
|
853933b0ea
|
【优化】服务器列表排序
|
2021-10-11 15:01:49 +08:00 |
ZhangBiao
|
294147b9ba
|
【御剑行】提交
|
2021-10-11 14:37:33 +08:00 |
jiaoyangna
|
4ff2e1dc8d
|
【ID1010436】
【优化】好感度增加通用礼物 及界面优化
|
2021-10-11 13:53:02 +08:00 |
jiaoyangna
|
d9dce4e4ca
|
【ID1010436】
【优化】好感度增加通用礼物 及界面优化
|
2021-10-11 12:45:23 +08:00 |
jiaoyangna
|
5f15c8549e
|
【ID1010432】
【四灵试炼】编队界面的神将排序改为与心魔试炼相同
|
2021-10-11 11:33:55 +08:00 |
jiaoyangna
|
1269b5b114
|
【ID1010436】
【优化】好感度增加通用礼物 及界面优化
|
2021-10-11 11:31:03 +08:00 |
wangzhenxing
|
453216c6c7
|
【战斗】==========被动344修改
|
2021-10-09 18:23:45 +08:00 |
ZhangBiao
|
a0911448b2
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
|
2021-10-09 18:18:32 +08:00 |
ZhangBiao
|
110a6d64c0
|
【御剑行】导入资源,剑
|
2021-10-09 18:17:59 +08:00 |
wangzhenxing
|
79addd132d
|
[战斗]=========被动250 修改
|
2021-10-09 18:10:11 +08:00 |
wangzhenxing
|
4bd1047ccc
|
[战斗]=====被动116 258 281 312 344修改
|
2021-10-09 17:13:24 +08:00 |
liujiaqi
|
24c77a0d7e
|
【资源】杨戬音频
|
2021-10-09 16:39:45 +08:00 |
ZhangBiao
|
895916a53a
|
【御剑行】提交
|
2021-10-09 16:24:34 +08:00 |
jiaoyangna
|
ad690ffc38
|
去掉次数修改
|
2021-10-09 15:26:33 +08:00 |
jiaoyangna
|
f4997e7a57
|
【ID1018706】
【巅峰赛】准备阶段一键上阵可以换人
|
2021-10-09 15:22:42 +08:00 |
jiaoyangna
|
4b7838584b
|
红点修改提交
|
2021-10-09 15:04:43 +08:00 |
jiaoyangna
|
89f66bc294
|
特权收益描述修改提交
|
2021-10-09 14:53:22 +08:00 |
jiaoyangna
|
173bec2de7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-09 14:34:52 +08:00 |
jiaoyangna
|
e3bb67c8a1
|
特权收益显示修改提交
|
2021-10-09 14:34:34 +08:00 |
ZhangBiao
|
f1e5f69614
|
【御剑行】提交
|
2021-10-09 14:33:09 +08:00 |
wangzhenxing
|
cdd9f0a524
|
[战斗]====破盾状态字图片替换修改
|
2021-10-09 14:17:35 +08:00 |
jiaoyangna
|
7737449829
|
【ID1018681】
【好感度】逍遥游游历成功界面的礼物图标点不开
|
2021-10-09 12:14:34 +08:00 |
jiaoyangna
|
d58e38fcea
|
【ID1018684】
【好感度】好感度挂机加成没在挂机奖励预览处显示数量
|
2021-10-09 12:04:01 +08:00 |
jiaoyangna
|
32a38b6053
|
【ID1018679】
【好感度】礼物图标在背包没阵营标记
|
2021-10-09 11:39:09 +08:00 |
jiaoyangna
|
a2cced9272
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-09 11:25:22 +08:00 |
jiaoyangna
|
57304e0dc3
|
ID1018685】
【好感度】挂机预览加成心形图标左右不居中,特权图标上下不居中
【ID1018687】
【好感度】赠与界面,神将名字不居中
|
2021-10-09 11:24:39 +08:00 |
ZhangBiao
|
5d4dc1ab37
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-09 11:15:04 +08:00 |
ZhangBiao
|
e8bfd73a9d
|
【织女】立绘不动修改
|
2021-10-09 11:14:24 +08:00 |
jiaoyangna
|
e23d1259f1
|
ID1018689】
【好感度】好感度详情界面,好感等级进度,已达成的固定显示好感度
|
2021-10-09 11:09:53 +08:00 |
jiaoyangna
|
8b13f803c8
|
ID1018691】
【好感度】背包里所有5星好感度都满了,好感度入口还显示红点
|
2021-10-09 11:06:59 +08:00 |
ZhangBiao
|
f2b5f62ddd
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
# Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_01.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_02.mp3.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-10-09 11:00:18 +08:00 |
ZhangBiao
|
09bb4fc688
|
【御剑行】可以读取剧本移动了
|
2021-10-09 10:56:49 +08:00 |
jiaoyangna
|
845373e12d
|
好感度长按修改提交
|
2021-10-09 10:53:32 +08:00 |
ZhangBiao
|
21bdecb465
|
【御剑行】提交
|
2021-10-08 20:49:25 +08:00 |
jiaoyangna
|
c72d3af853
|
【ID1018697】
【佩戴魂印】本地dev佩戴魂印没有战力上升提示了
|
2021-10-08 19:32:16 +08:00 |
jiaoyangna
|
937096d445
|
【ID1018697】
【佩戴魂印】本地dev佩戴魂印没有战力上升提示了
|
2021-10-08 19:17:59 +08:00 |
jiaoyangna
|
7b88415339
|
好感度优化提交
|
2021-10-08 18:53:06 +08:00 |
ZhangBiao
|
81a3db0446
|
【御剑行】提交
|
2021-10-08 15:45:28 +08:00 |
jiaoyangna
|
6700723aaa
|
好感度0级挂机收益显示错误修改
|
2021-10-08 14:31:28 +08:00 |
jiaoyangna
|
ce39857111
|
杨戬新资源修改提交
|
2021-10-08 14:18:31 +08:00 |
jiaoyangna
|
8d91a6d875
|
协议提交
|
2021-10-08 13:09:13 +08:00 |
jiaoyangna
|
491c04b2a3
|
装备套装属性预设修改提交
|
2021-10-08 12:14:48 +08:00 |
jiaoyangna
|
14008964fc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-08 11:55:25 +08:00 |
jiaoyangna
|
f449016952
|
添加容错
|
2021-10-08 11:55:01 +08:00 |
ZhangBiao
|
878f0410ee
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-08 11:54:09 +08:00 |
ZhangBiao
|
eb816dcc89
|
【七界试炼】修复无法取消激活
|
2021-10-08 11:53:54 +08:00 |
jiaoyangna
|
e019ef8f22
|
【ID1010392】
点石成金基础收益随着玩家等级提升
|
2021-10-08 11:51:37 +08:00 |
jiaoyangna
|
8de35750c6
|
【ID1010413】
【新功能】玩家等级提升时 发放道具进背包
|
2021-10-08 11:34:48 +08:00 |
gaoxin
|
2dbb544a46
|
【登录】登录接口编号增加
|
2021-09-30 15:19:10 +08:00 |
wangzhenxing
|
36d542ba9d
|
玉虚论道优化提交
|
2021-09-30 15:12:02 +08:00 |
gaoxin
|
2eb04261bc
|
Merge branch '0优化/装备对比' into china/dev
|
2021-09-30 15:01:40 +08:00 |
gaoxin
|
4d907f1530
|
【装备界面优化】移除替换装备和宝物时上方的当前装备/宝物信息
|
2021-09-30 15:01:19 +08:00 |
jiaoyangna
|
6ebea4784d
|
好感度报错修改
|
2021-09-30 11:37:24 +08:00 |
jiaoyangna
|
cb9384efd7
|
【ID1018672】
【文字颜色不清晰】粉色心中间数字换种字体颜色
(cherry picked from commit ffde7813a0)
|
2021-09-30 11:03:14 +08:00 |
jiaoyangna
|
7b57e44279
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-30 11:01:11 +08:00 |
jiaoyangna
|
115e067efb
|
好感度漏提
|
2021-09-30 11:00:58 +08:00 |
wangzhenxing
|
31e8594a70
|
[战斗]=========御甲添加 图片字提示表现
|
2021-09-30 09:53:31 +08:00 |
JLIOSM1
|
13f9e653ae
|
【称号】罗浮之主称号显示错误
|
2021-09-29 20:41:19 +08:00 |
ZhangBiao
|
660a88b965
|
【御剑行】提交
|
2021-09-29 18:34:54 +08:00 |
jiaoyangna
|
b88bfef04f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-29 18:23:26 +08:00 |
jiaoyangna
|
b44c4af217
|
好感度0点次数刷新修改
|
2021-09-29 18:23:13 +08:00 |
gaoxin
|
73709000a9
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-29 17:34:38 +08:00 |
gaoxin
|
971a457224
|
【战斗力】修复计算在编队上的人物临时数据时未计算编队相关属性的问题
|
2021-09-29 17:34:20 +08:00 |
jiaoyangna
|
de2aa940b4
|
七界试炼预设调整
|
2021-09-29 16:55:56 +08:00 |
wangzhenxing
|
98d09ef527
|
排行榜参数修改
|
2021-09-29 16:33:26 +08:00 |
jiaoyangna
|
8abe248a24
|
逍遥游奖励界面修改提交
|
2021-09-29 16:21:24 +08:00 |
jiaoyangna
|
4dfdc507f7
|
绿色修改提交
|
2021-09-29 16:19:29 +08:00 |
jiaoyangna
|
a62e656d7b
|
Merge branch 'china/dev' into 0功能/好感度
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua
|
2021-09-29 15:49:39 +08:00 |
gaoxin
|
0abe5663c6
|
【战斗力】debug时不再计算老版本的战斗力
|
2021-09-29 14:55:14 +08:00 |
jiaoyangna
|
ee096187ad
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-29 14:35:15 +08:00 |
jiaoyangna
|
f2273e427c
|
逍遥游改表代码修改提交
|
2021-09-29 14:34:59 +08:00 |
gaoxin
|
2352144ead
|
【四灵试炼】助战神将报错
|
2021-09-29 09:19:53 +08:00 |
gaoxin
|
b1dff6a023
|
【四灵试炼】修复计算助战神将战斗力报错
|
2021-09-29 08:33:09 +08:00 |
gaoxin
|
8692e6cec9
|
【四灵试炼】修复计算助战神将战斗力报错
|
2021-09-29 08:32:40 +08:00 |
gaoxin
|
788d18e332
|
【装备对比】背包中的装备信息界面修改
|
2021-09-28 21:00:50 +08:00 |
gaoxin
|
e56affc4b4
|
【装备对比】装备穿戴界面显示修改
|
2021-09-28 19:45:21 +08:00 |
gaoxin
|
eb452a1c69
|
【图片压缩工具】
|
2021-09-28 19:44:39 +08:00 |
gaoxin
|
37381da67e
|
【特效】修复特效贴图过大的问题
|
2021-09-28 19:35:46 +08:00 |
jiaoyangna
|
c242b86dd2
|
好感度详情提交
|
2021-09-28 18:23:37 +08:00 |
jiaoyangna
|
5d3871ef17
|
玲珑宝镜进度条颜色修改提交
|
2021-09-28 17:49:52 +08:00 |
ZhangBiao
|
fa1c5a5dee
|
【御剑行】提交
|
2021-09-28 17:48:28 +08:00 |
jiaoyangna
|
b6a9cbc1c1
|
进度条修改提交
(cherry picked from commit 592845bf98)
|
2021-09-28 17:41:47 +08:00 |
wangzhenxing
|
81ace8ae2e
|
玉虚论道入口修改
|
2021-09-28 17:29:33 +08:00 |
jiaoyangna
|
d7dc0425cb
|
玲珑宝镜修改提交
|
2021-09-28 17:22:00 +08:00 |
jiaoyangna
|
b978377005
|
玲珑宝镜预设修改提交
|
2021-09-28 16:19:40 +08:00 |
wangzhenxing
|
d45abf6fcf
|
Merge branch 'china/dev' into 0功能/玉虚论道
|
2021-09-28 15:54:33 +08:00 |
wangzhenxing
|
ae3efee379
|
提交修改
|
2021-09-28 15:50:09 +08:00 |
jiaoyangna
|
f4d4144ff4
|
玲珑宝镜修改提交
|
2021-09-28 15:30:06 +08:00 |
wangzhenxing
|
46efbf99db
|
战斗信息界面预设修改提交
|
2021-09-28 15:19:11 +08:00 |
jiaoyangna
|
26832c2350
|
去掉log
|
2021-09-28 13:43:23 +08:00 |
jiaoyangna
|
d9162dbbe3
|
选中框修改提交
|
2021-09-28 13:39:24 +08:00 |
wangzhenxing
|
f580f14a44
|
段位特效修改提交
|
2021-09-28 11:51:20 +08:00 |
jiaoyangna
|
5d9b93ca57
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-28 11:31:00 +08:00 |
jiaoyangna
|
46731f726f
|
玲珑宝镜修改提交
|
2021-09-28 11:30:44 +08:00 |
ZhangBiao
|
77eccdd8b7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-28 11:24:04 +08:00 |
ZhangBiao
|
8ec75376da
|
【限时召唤】报错修改
|
2021-09-28 11:23:50 +08:00 |
gaoxin
|
4d4e8cf55e
|
【副本战斗】战斗结算时报错
|
2021-09-28 11:20:42 +08:00 |
ZhangBiao
|
422806200e
|
【御剑行】提交
|
2021-09-28 10:34:05 +08:00 |
wangzhenxing
|
e42540ade8
|
排行榜修改提交
|
2021-09-28 10:29:33 +08:00 |
jiaoyangna
|
b0c02a7ff0
|
修改道具排序顺序
|
2021-09-28 10:12:12 +08:00 |
jiaoyangna
|
33acb35f82
|
Merge branch 'china/dev' into 0功能/好感度
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-09-28 09:52:22 +08:00 |
jiaoyangna
|
92294c6239
|
赠送之后立绘动作修改
|
2021-09-28 09:47:56 +08:00 |
jiaoyangna
|
a3a8e8c2a7
|
预设修改提交
|
2021-09-27 21:53:04 +08:00 |
jiaoyangna
|
e54fc2faa9
|
去掉左右切换按钮
|
2021-09-27 21:43:04 +08:00 |
jiaoyangna
|
ba7421ffa7
|
添加点击神将的互动
|
2021-09-27 21:39:43 +08:00 |
jiaoyangna
|
6de82cb731
|
好感度tips 提交
|
2021-09-27 21:35:55 +08:00 |
jiaoyangna
|
6e3dbffb64
|
报错修改
|
2021-09-27 20:33:45 +08:00 |
jiaoyangna
|
2e2a0d6edd
|
桃心位置修改
|
2021-09-27 20:26:45 +08:00 |
gaoxin
|
94782f7cf4
|
【ID1018635】 【唯一限制魂印】同时戴舍身济世和历战之躯,恭送掉该神将数据只会清一个,另一个依然是无法佩戴
|
2021-09-27 20:18:10 +08:00 |
jiaoyangna
|
75049d619c
|
好感度位置修改
|
2021-09-27 20:07:55 +08:00 |
jiaoyangna
|
af63daaeaf
|
好感度到达最大值修改
|
2021-09-27 19:20:29 +08:00 |
gaoxin
|
ed3f38f9cb
|
【战斗力】修复部分数据刷新不及时
|
2021-09-27 18:33:58 +08:00 |
ZhangBiao
|
a67e3226ce
|
【寻宝迷踪】走到指定地点,返回,再进入挖宝图标亮起
|
2021-09-27 17:52:24 +08:00 |
ZhangBiao
|
1fd9f8a004
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-27 17:46:53 +08:00 |
jiaoyangna
|
ad35e1646c
|
特权显示修改
|
2021-09-27 17:46:43 +08:00 |
ZhangBiao
|
a8c9c836a9
|
【排行榜】膜拜转圈儿修复
|
2021-09-27 17:46:40 +08:00 |
gaoxin
|
a2cd31dbd2
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-27 17:35:48 +08:00 |
gaoxin
|
eacf753e55
|
【战斗力】修复部分设置人物属性全部为脏数据时没有设置战斗力脏数据
|
2021-09-27 17:35:36 +08:00 |
wangzhenxing
|
1a808dfd54
|
[战斗]============被动137修改 添加查找没有触发不灭的技能目标
|
2021-09-27 17:33:51 +08:00 |
jiaoyangna
|
ea52d01112
|
好感度新手引导修改提交
|
2021-09-27 17:26:35 +08:00 |
gaoxin
|
f929826eba
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-27 17:15:42 +08:00 |
gaoxin
|
07a96a88e4
|
【轩辕宝镜】修复只上阵了满足条件的神将,没有补位的问题
|
2021-09-27 17:13:48 +08:00 |
ZhangBiao
|
a4ee19a351
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-27 17:02:59 +08:00 |
skuld
|
854f2df748
|
【四灵试炼】增加一行文字
|
2021-11-02 02:46:08 +08:00 |
ZhangBiao
|
5939c5b2f8
|
【七界试炼】跳转提交
|
2021-09-27 17:02:43 +08:00 |
gaoxin
|
c8c003abb7
|
【无尽副本】修复编队无法保存的问题
|
2021-09-27 16:58:08 +08:00 |
gaoxin
|
38f41e7517
|
【战斗】修复无尽副本战斗结束后报错
|
2021-09-27 16:57:40 +08:00 |
jiaoyangna
|
c778c334e5
|
添加道具属性显示
|
2021-09-27 16:49:25 +08:00 |
jiaoyangna
|
644d8e3790
|
长按短按效果添加
|
2021-09-27 16:43:01 +08:00 |
jiaoyangna
|
9276097bf4
|
神将不能拖动修改
|
2021-09-27 16:27:58 +08:00 |
wangzhenxing
|
70ebab2fe1
|
【功能】====装备合成添加特效
|
2021-09-27 16:25:20 +08:00 |
jiaoyangna
|
516ddb44ae
|
预设大小修改
|
2021-09-27 15:58:34 +08:00 |
yuanshuai
|
f16bb7ed8e
|
【四象心法】长按强化bug修改
|
2021-09-27 15:57:36 +08:00 |
jiaoyangna
|
8aeb4f2416
|
添加逍遥游跳转
|
2021-09-27 15:50:25 +08:00 |
jiaoyangna
|
1d1e21a9e7
|
属性格式修改提交
|
2021-09-27 15:45:23 +08:00 |
gaoxin
|
0233ff87e7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-27 15:36:00 +08:00 |
gaoxin
|
34ade2489d
|
【无尽副本】修复报错
|
2021-09-27 15:35:48 +08:00 |
ZhangBiao
|
6bc25cd08c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-27 15:33:52 +08:00 |
ZhangBiao
|
e4250d3fac
|
【七界试炼】红点不再请求数据
|
2021-09-27 15:33:30 +08:00 |
gaoxin
|
6c50cdfd09
|
【无尽副本】修复无尽副本编队没有人得问题
|
2021-09-27 14:57:27 +08:00 |
ZhangBiao
|
810614f226
|
【四象心法】增加跳转
(cherry picked from commit 98d3911f23)
|
2021-09-27 14:37:20 +08:00 |
ZhangBiao
|
ea61fced0d
|
【御剑行】提交
|
2021-09-27 14:33:23 +08:00 |
ZhangBiao
|
98d3911f23
|
【四象心法】增加跳转
|
2021-09-27 14:32:59 +08:00 |
jiaoyangna
|
9137d9f592
|
新手引导调整
|
2021-09-27 14:22:23 +08:00 |
gaoxin
|
919740cdae
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-27 13:48:13 +08:00 |
gaoxin
|
5ae29d86cd
|
【织女】法宝资源名修改
|
2021-09-27 13:48:09 +08:00 |
gaoxin
|
2dca8dadf4
|
【资源】织女音效提交
|
2021-09-27 13:48:02 +08:00 |
liujiaqi
|
f17f7cd6dc
|
【资源】织女技能字音效
|
2021-09-27 13:47:32 +08:00 |
wangzhenxing
|
433ae25590
|
[战斗]======被动351 353 修改
|
2021-09-27 13:47:27 +08:00 |
gaoxin
|
f16fb2680b
|
【织女特效】资源名重复优化
|
2021-09-27 13:47:23 +08:00 |
wangzhenxing
|
5c5e0e26a3
|
【资源】=========织女 特效资源提交
|
2021-09-27 13:46:53 +08:00 |
ZhangBiao
|
90d9530b2b
|
【乾坤宝盒】报错修改
|
2021-09-27 11:46:17 +08:00 |
jiaoyangna
|
fb2bcaff48
|
好感度增加返回提示
|
2021-09-27 11:22:17 +08:00 |
ZhangBiao
|
a3c65ee8d1
|
【装备名称】金色->白金
|
2021-09-27 11:12:21 +08:00 |
jiaoyangna
|
4e17b829ba
|
红点修改提交,挂机界面预览修改提交
|
2021-09-27 10:58:41 +08:00 |
jiaoyangna
|
d4e3a3294c
|
引导修改提交
|
2021-09-27 10:41:32 +08:00 |
ZhangBiao
|
cdd6499fe8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-27 10:34:19 +08:00 |
ZhangBiao
|
0842438fdf
|
【装备分解】不可分解白金装备and增加mask点击
|
2021-09-27 10:34:03 +08:00 |
jiaoyangna
|
683e71ae89
|
好感度入口调整
|
2021-09-27 09:45:57 +08:00 |
gaoxin
|
dcdaf48e4d
|
【玉虚】关闭manager初始化
|
2021-09-26 21:50:50 +08:00 |
jiaoyangna
|
13428bc854
|
神将排序修改
|
2021-09-26 21:49:05 +08:00 |
jiaoyangna
|
a0778d0173
|
新手引导修改
|
2021-09-26 21:46:01 +08:00 |
jiaoyangna
|
3a5e3cf17e
|
好感度提交
|
2021-09-26 21:32:04 +08:00 |
gaoxin
|
7b93cc9519
|
Revert "织女法宝图标和音频"
This reverts commit f8f07c0bea.
|
2021-09-26 21:26:31 +08:00 |
gaoxin
|
d770ea347e
|
Revert "bat Resource Commit:2021/09/24,11:02:09"
This reverts commit a807bb6cf5.
|
2021-09-26 21:23:05 +08:00 |
gaoxin
|
ace42823db
|
【战斗】被动353,修复溢出的伤害无法被无敌盾抵消的问题
|
2021-09-26 20:48:32 +08:00 |
gaoxin
|
2bce8547c7
|
【战斗】被动353直接伤害击杀目标溢出伤害的[a]%将对生命百分比[b]的目标造成伤害
|
2021-09-26 20:31:51 +08:00 |
jiaoyangna
|
d39ef472dc
|
好感度提交
|
2021-09-26 20:23:08 +08:00 |
wangzhenxing
|
3ff3649284
|
【功能】======白金装备合成 最少显示信息修改
|
2021-09-26 20:03:14 +08:00 |
wangzhenxing
|
306ab999b9
|
[功能]=============白金装备合成红点修改
|
2021-09-26 19:47:18 +08:00 |
liujiaqi
|
f8f07c0bea
|
织女法宝图标和音频
|
2021-09-26 19:13:15 +08:00 |
gaoxin
|
f282fe046b
|
【白金装备】修改白金装备字体显示
|
2021-09-26 18:41:47 +08:00 |
gaoxin
|
54afaef65a
|
【GM】一键顶级装备红色一星装备生成错误
|
2021-09-26 17:43:38 +08:00 |
gaoxin
|
e318ca197f
|
【GM】一键顶级装备,增加白金装备
|
2021-09-26 17:40:48 +08:00 |
ZhangBiao
|
a565d94658
|
【御剑行】资源提交
|
2021-09-26 17:39:49 +08:00 |
gaoxin
|
8310c29aaf
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-26 17:38:39 +08:00 |
gaoxin
|
b21e7efe0d
|
【角色信息】修复跳转到角色信息界面,点击左右箭头报错
|
2021-09-26 17:38:23 +08:00 |
wangzhenxing
|
e763b6472b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-26 17:31:16 +08:00 |
wangzhenxing
|
a3e1782007
|
【功能】==========白金装备合成提交
|
2021-09-26 17:30:35 +08:00 |
gaoxin
|
e61dea0f4a
|
【白金装备】套装显示添加
|
2021-09-26 17:13:12 +08:00 |
jiaoyangna
|
d7276eae64
|
战力修改提交
|
2021-09-26 15:23:33 +08:00 |
gaoxin
|
e671673389
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-26 15:02:49 +08:00 |
gaoxin
|
59311a8d88
|
【跨服】算错了跨服前七天的事件
|
2021-09-26 15:02:33 +08:00 |
wangzhenxing
|
e1c0ee1613
|
[战斗]====御甲条图片修改
|
2021-09-26 14:58:02 +08:00 |
wangzhenxing
|
221939e1ec
|
[战斗]==========御甲条显示修改
|
2021-09-26 14:56:07 +08:00 |
jiaoyangna
|
330b36b55a
|
好感度等级修改
|
2021-09-26 14:21:22 +08:00 |
jiaoyangna
|
e59f160387
|
好感度等级修改提交
|
2021-09-26 13:55:57 +08:00 |
gaoxin
|
6a71a972e9
|
【战斗力】关闭一些log
|
2021-09-26 11:18:38 +08:00 |
jiaoyangna
|
14b967185b
|
好感度提交
|
2021-09-26 10:18:51 +08:00 |
gaoxin
|
cc68282fb8
|
【法宝升阶】修复战力提升文字显示错误
|
2021-09-26 10:16:00 +08:00 |
ZhangBiao
|
f1dd5d195c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-26 10:08:38 +08:00 |
ZhangBiao
|
59e51aefef
|
【七界试炼】提交
|
2021-09-26 10:08:15 +08:00 |
gaoxin
|
9b67b9247b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-26 10:04:06 +08:00 |
gaoxin
|
b318ed5678
|
【资源】部分界面战力文字换成评分
|
2021-09-26 10:03:50 +08:00 |
ZhangBiao
|
8f9743d127
|
【七界试炼】激活遗物提示,奖励遮盖
|
2021-09-26 10:01:37 +08:00 |
jiaoyangna
|
1152586ff1
|
好感度提交
|
2021-09-26 09:54:58 +08:00 |
ZhangBiao
|
bac86d5ec8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-24 19:23:43 +08:00 |
liujiaqi
|
cc33532a51
|
【资源】女儿国王皮肤音效
|
2021-10-01 18:06:48 +08:00 |
ZhangBiao
|
1a866b1068
|
【七界试炼】提交
|
2021-09-24 19:23:30 +08:00 |
gaoxin
|
8c76d476a2
|
【编队】修复保存编队接口名修改导致的报错
|
2021-09-24 17:49:32 +08:00 |
wangzhenxing
|
d83cf97ae2
|
【战斗】==========被动93 307 309 351修改
|
2021-09-24 17:40:08 +08:00 |
ZhangBiao
|
1505647241
|
【七界试炼】框位不齐
|
2021-09-24 17:02:38 +08:00 |
ZhangBiao
|
35091621dc
|
【七界试炼】提交
|
2021-09-24 16:52:05 +08:00 |
ZhangBiao
|
a823984187
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-24 16:47:19 +08:00 |
ZhangBiao
|
028f97c195
|
【七界试炼】红点和跳转i需改
|
2021-09-24 16:47:06 +08:00 |
yuanshuai
|
77a47432bf
|
【四象心法】强化按钮点击强化两次bug修改
|
2021-09-24 15:59:01 +08:00 |
yuanshuai
|
ad8f5ac73e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-24 15:45:50 +08:00 |
yuanshuai
|
7f94f9e185
|
思想心法bug修改
|
2021-09-24 15:45:20 +08:00 |
wangzhenxing
|
34f52e18e7
|
[战斗]=====被动352 描述修改
|
2021-09-24 15:20:59 +08:00 |
wangzhenxing
|
e8b7af1cf7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-24 15:14:29 +08:00 |
wangzhenxing
|
8ffd86ee19
|
Merge branch 'china/dev-c-battle' into china/dev
Conflicts:
Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
|
2021-09-24 15:13:46 +08:00 |
ZhangBiao
|
ff9d22e14d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-24 15:12:42 +08:00 |
ZhangBiao
|
ce1a5f25ea
|
【七界试炼】奖励位置调整
|
2021-09-24 15:11:57 +08:00 |
wangzhenxing
|
8de85a24a4
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-24 15:04:57 +08:00 |
gaoxin
|
c15294b14c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-24 15:00:57 +08:00 |
gaoxin
|
5f3768e831
|
【新资源meta文件上传】
|
2021-09-24 15:00:44 +08:00 |
wangzhenxing
|
19f7984f01
|
[战斗]=============新增352被动
|
2021-09-24 14:59:54 +08:00 |
ZhangBiao
|
c862eac46e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-24 14:57:14 +08:00 |
ZhangBiao
|
b0e24676b3
|
【七界试炼】增加秘宝入口开启处理
|
2021-09-24 14:57:04 +08:00 |
wangzhenxing
|
9abf1ef390
|
Merge branch 'china/dev-c-battle' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c-battle
Conflicts:
Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
|
2021-09-24 14:56:13 +08:00 |
wangzhenxing
|
c573d83eeb
|
女儿国王特效资源提交
|
2021-09-24 14:53:47 +08:00 |
liujiaqi
|
f89e16792e
|
【资源】女儿国王大小头像
|
2021-09-24 14:53:34 +08:00 |
gaoxin
|
4e441f4942
|
【资源】女儿国王默认动画添加
|
2021-09-24 14:53:04 +08:00 |
gaoxin
|
00db8bf660
|
【资源】女儿国王皮肤资源上传
|
2021-09-24 14:52:58 +08:00 |
wangzhenxing
|
48cc9357c1
|
[战斗]==========被动194修改 新增被动251 额外行动修改
|
2021-09-24 14:46:02 +08:00 |
jiaoyangna
|
136d872fbd
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-24 14:20:32 +08:00 |
jiaoyangna
|
003583db7b
|
无尽副本报错修改
|
2021-09-24 14:19:50 +08:00 |
ZhangBiao
|
9ff1957ff7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-24 14:06:26 +08:00 |
ZhangBiao
|
c9305b4247
|
【七界试炼】提交
|
2021-09-24 14:06:09 +08:00 |
liujiaqi
|
0b91f698c8
|
【资源】麒麟卡
|
2021-09-24 12:41:05 +08:00 |
liujiaqi
|
8531ab1c2e
|
【资源】坐骑icon
|
2021-09-24 12:40:57 +08:00 |
gaoxin
|
8fd74e7e99
|
【资源】坐骑麒麟live2d上传
|
2021-09-24 12:40:35 +08:00 |
wangzhenxing
|
5c174efcbd
|
排行榜修改
|
2021-09-24 11:09:09 +08:00 |
gaoxin
|
5c3fb8408b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-24 11:07:21 +08:00 |
gaoxin
|
ddb97196d9
|
【首充】金额改为special表配置
|
2021-09-24 11:05:39 +08:00 |
luyao
|
9e2f4e1512
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-24 11:02:53 +08:00 |
luyao
|
a807bb6cf5
|
bat Resource Commit:2021/09/24,11:02:09
|
2021-09-24 11:02:09 +08:00 |
ZhangBiao
|
35e6c617fb
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-24 10:28:10 +08:00 |
ZhangBiao
|
8bd1896aba
|
【七界试炼】敌方英雄展示修改
|
2021-09-24 10:27:56 +08:00 |
gaoxin
|
2473fb149a
|
【ID1018513】【魂印分解】选择多个魂印分解时就算紫色也会提示选择了金色,单个魂印分解时就算白金也不提示
【ID1018512】【魂印分解】列表拖动到底部,点击筛选页签,不回弹
|
2021-09-24 10:17:25 +08:00 |
gaoxin
|
65efa9336c
|
【魂印】修复神将恭送后没有重置魂印的穿戴状态,导致力战之躯魂印无法穿戴的问题
|
2021-09-23 20:59:44 +08:00 |
ZhangBiao
|
a2d7bedb5b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-23 19:47:32 +08:00 |
ZhangBiao
|
d0c38ec9d7
|
【七界试炼】提交
|
2021-09-23 19:47:17 +08:00 |
wangzhenxing
|
212cc1f946
|
Merge branch 'china/dev' into 0功能/玉虚论道
|
2021-09-23 19:46:09 +08:00 |
gaoxin
|
65df3f1a37
|
【名字】添加名称正确性检测
|
2021-09-23 19:43:24 +08:00 |
gaoxin
|
c3820f13ae
|
【编队】修复无法复制编队的问题
|
2021-09-23 19:42:45 +08:00 |
ZhangBiao
|
6ced770ef1
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-23 19:23:37 +08:00 |
ZhangBiao
|
5af10faa57
|
【七界试炼】提交
|
2021-09-23 19:23:27 +08:00 |
xuexinpeng
|
02f840ee83
|
Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道
|
2021-09-23 18:04:24 +08:00 |
xuexinpeng
|
ff74924ea9
|
添加gm
|
2021-09-23 17:59:28 +08:00 |
gaoxin
|
0d76922c85
|
【编队】刷新编队时,保存编队的方法错误
|
2021-09-23 17:54:29 +08:00 |
jiaoyangna
|
a255a6fb42
|
点击区域修改提交
|
2021-09-23 17:25:33 +08:00 |
jiaoyangna
|
ee5182dced
|
玲珑宝镜领取状态修改提交
|
2021-09-23 16:59:30 +08:00 |
jiaoyangna
|
fcae70ae04
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-23 16:50:48 +08:00 |
jiaoyangna
|
80e2cab589
|
玲珑宝镜跳转修改提交
|
2021-09-23 16:50:24 +08:00 |
ZhangBiao
|
170d4886e3
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-23 16:46:50 +08:00 |
ZhangBiao
|
93b3839727
|
【七界试炼】商店刷新事件
|
2021-09-23 16:46:35 +08:00 |
jiaoyangna
|
ec8d3631d9
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-23 16:46:16 +08:00 |
skuld
|
85f227ee8e
|
bat Resource Commit:2021/10/12, 2:02:56
|
2021-10-12 02:02:56 +08:00 |
jiaoyangna
|
5b7b607725
|
主城玲珑宝镜入口提交
|
2021-09-23 16:21:51 +08:00 |
gaoxin
|
515294f16b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-23 16:17:09 +08:00 |
gaoxin
|
0f534367c5
|
【战斗力】不再计算编队老战斗力
|
2021-09-23 16:16:57 +08:00 |
luyao
|
1a2e24b96d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-23 16:13:14 +08:00 |
luyao
|
ca6b5ebe7d
|
bat Resource Commit:2021/09/23,16:11:26
|
2021-09-23 16:11:26 +08:00 |
ZhangBiao
|
9b24649f36
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-23 16:08:13 +08:00 |
ZhangBiao
|
0422b5c738
|
【七界试炼】提交
|
2021-09-23 16:08:02 +08:00 |
gaoxin
|
ac88b50cae
|
【编队】修复打开四灵试炼编队报错
|
2021-09-23 16:05:18 +08:00 |
gaoxin
|
41aaab4d09
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-23 15:52:30 +08:00 |
gaoxin
|
f6c336e52f
|
【战斗力】添加一些log
|
2021-09-23 15:52:19 +08:00 |
gaoxin
|
1e011b560a
|
【跨服】开服前七天无法进入跨服
|
2021-09-23 15:52:01 +08:00 |
jiaoyangna
|
2e08cf7672
|
玲珑宝镜消耗道具添加加号
|
2021-09-23 15:50:32 +08:00 |
jiaoyangna
|
8f71700122
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-23 15:45:54 +08:00 |
jiaoyangna
|
ef2d856bdf
|
玲珑宝镜预设调整
|
2021-09-23 15:45:41 +08:00 |
gaoxin
|
e362321aa5
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-23 14:54:28 +08:00 |
gaoxin
|
b32183f20a
|
【玩家数据】添加服务器开启时间字段
|
2021-09-23 14:54:12 +08:00 |