ZhangBiao
|
bc46019646
|
【战令优化】无尽副本任务数量冗余修改
|
2021-07-29 17:12:21 +08:00 |
zhangqiang
|
8b56e352ba
|
【跨服排行榜】
|
2021-07-29 17:11:10 +08:00 |
zhangqiang
|
c11d9849fd
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2021-07-29 16:38:35 +08:00 |
zhangqiang
|
9c28f232f6
|
【跨服排行榜】
|
2021-07-29 16:35:58 +08:00 |
jiaoyangna
|
283f9d209a
|
魂印圈圈错误修改
|
2021-07-29 16:35:20 +08:00 |
jiaoyangna
|
6f24638e3e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-29 16:10:43 +08:00 |
jiaoyangna
|
52e9f406aa
|
十绝阵当我的排名为0 时报错
|
2021-07-29 16:10:39 +08:00 |
wangzhenxing
|
2cafeecb80
|
[战斗]==============死亡技能不受眩晕,沉默影响
|
2021-07-29 15:44:23 +08:00 |
jiaoyangna
|
706ee26390
|
魂印分解界面特效被切修改
|
2021-07-29 15:31:09 +08:00 |
jiaoyangna
|
01632378f6
|
魂印分解界面修改
|
2021-07-29 15:21:44 +08:00 |
jiaoyangna
|
856f03b494
|
【ID1017815】
【魂印分解】一键选择,优先选择了品质高的魂印
|
2021-07-29 15:01:58 +08:00 |
jiaoyangna
|
548e43b486
|
共鸣中去掉一键装备红点
|
2021-07-29 14:33:52 +08:00 |
jiaoyangna
|
2f47e10caf
|
重置提交
|
2021-07-29 14:20:51 +08:00 |
jiaoyangna
|
44965dd1c2
|
跨服十绝阵提交
|
2021-07-29 12:09:03 +08:00 |
jiaoyangna
|
50963966fa
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-29 11:53:16 +08:00 |
jiaoyangna
|
beacff1d20
|
共鸣中的宝物去掉红点
|
2021-07-29 11:53:11 +08:00 |
gaoxin
|
a61602eae4
|
【角色信息】删除服务器名称只在JUMPSERVER类型下显示的限制
|
2021-07-29 11:50:59 +08:00 |
gaoxin
|
1b3e5c196b
|
【跨服聊天】完善跨服聊天角色信息显示
|
2021-07-29 11:46:59 +08:00 |
gaoxin
|
381d537a4e
|
【登录】除流畅,拥挤和爆满外的其他状态全部不可进入游戏
|
2021-07-29 11:44:35 +08:00 |
jiaoyangna
|
f935fb163b
|
层级修改提交
|
2021-07-29 11:34:53 +08:00 |
jiaoyangna
|
522754669f
|
删除log
|
2021-07-29 11:31:30 +08:00 |
ZhangBiao
|
59c823e080
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-29 11:19:03 +08:00 |
ZhangBiao
|
68466c0fff
|
【副本界面】按钮调整
|
2021-07-29 11:18:53 +08:00 |
jiaoyangna
|
cfdc6b0abc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-29 11:13:44 +08:00 |
jiaoyangna
|
63780c4c7a
|
宝物共鸣修改
|
2021-07-29 11:13:34 +08:00 |
zhangqiang
|
1969dd31ab
|
Revert "【跨服切磋】"
This reverts commit cc8974c016.
|
2021-07-29 11:11:16 +08:00 |
jiaoyangna
|
040cd78dc4
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-29 10:24:21 +08:00 |
jiaoyangna
|
12c8efa516
|
装备红点提交
|
2021-07-29 10:23:52 +08:00 |
ZhangBiao
|
e1ae3e3bf3
|
【副本界面】按下区域大小调整
|
2021-07-29 10:09:02 +08:00 |
zhangqiang
|
cc8974c016
|
【跨服切磋】
|
2021-07-28 18:38:06 +08:00 |
jiaoyangna
|
f4cc4d7df6
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-28 17:46:11 +08:00 |
jiaoyangna
|
7ee1ef9910
|
Merge branch 'china/dev-c' into china/dev
# Conflicts:
# Assets/ManagedResources/Atlas/DyAct_Activity5.meta
# Assets/ManagedResources/EffectResUI/ChengHao_new.meta
# Assets/ManagedResources/EffectResUI/ChengHao_new/Animation.meta
# Assets/ManagedResources/EffectResUI/ZhenQiBaoGe/Texture.meta
# Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
|
2021-07-28 17:45:59 +08:00 |
gaoxin
|
e552db5499
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-28 17:43:04 +08:00 |
gaoxin
|
ef78e0ae21
|
【跨服聊天】添加跨服聊天频道
|
2021-07-28 17:42:58 +08:00 |
jiaoyangna
|
b98fd71d35
|
删除资源工具提交
|
2021-07-28 17:00:14 +08:00 |
jiaoyangna
|
55c839dcd0
|
Revert "Revert "红点修改提交""
This reverts commit d53776b558.
|
2021-07-28 16:59:07 +08:00 |
jiaoyangna
|
8c01285354
|
Revert "Revert "强化和精炼界面修改""
This reverts commit 4c9871767f.
|
2021-07-28 16:59:00 +08:00 |
jiaoyangna
|
7ac8f03cd3
|
Revert "Revert "宝物培养修改提交""
This reverts commit 4590076eb9.
|
2021-07-28 16:58:52 +08:00 |
jiaoyangna
|
ab7c586a90
|
Revert "Revert "装备界面改动""
This reverts commit 9a1d361c63.
|
2021-07-28 16:58:44 +08:00 |
jiaoyangna
|
93a9473184
|
红点修改提交
|
2021-07-28 16:52:41 +08:00 |
ZhangBiao
|
33edb62796
|
【锻器阁】增加魂印合成引导
|
2021-07-28 16:45:29 +08:00 |
wangzhenxing
|
ef714577e8
|
[bug]========称号显示修改
|
2021-07-28 16:10:58 +08:00 |
zhangqiang
|
9a2d9c70a7
|
【新功能】罗浮争锋排行榜增加跨服切磋功能
|
2021-07-28 15:48:35 +08:00 |
jiaoyangna
|
ad850da05f
|
宝物共鸣修改
|
2021-07-28 15:40:50 +08:00 |
ZhangBiao
|
263cb18d03
|
【车迟斗法】玩法内等待次数刷新,红点不显示,退出重进显示正常 修复
|
2021-07-28 15:16:10 +08:00 |
jiaoyangna
|
4805b041e8
|
宝物使用跳转错误修改
|
2021-07-28 15:07:57 +08:00 |
jiaoyangna
|
ab9e5f8e64
|
红点修改提交
|
2021-07-28 14:00:17 +08:00 |
jiaoyangna
|
eea24f126e
|
红点添加
|
2021-07-28 13:49:04 +08:00 |
ZhangBiao
|
2c0c23553c
|
【逍遥游】恭喜获得中道具有跳转按钮,跳转后再返回显示空的恭喜获得
|
2021-07-28 12:06:58 +08:00 |
jiaoyangna
|
1123d9dc2d
|
宝物修改提交
|
2021-07-28 11:52:47 +08:00 |
ZhangBiao
|
48330717a7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-28 11:20:36 +08:00 |
ZhangBiao
|
ffd0685d97
|
【任务跳转】未解锁灵兽山,灵兽招募任务前往提示活动未开启,应提示功能未解锁
【红点】车迟斗法的红点仍绑在副本入口处,而非公会按钮
|
2021-07-28 11:20:27 +08:00 |
jiaoyangna
|
b0c50a4571
|
id1017799
(cherry picked from commit 35a048adc9)
|
2021-07-28 11:07:16 +08:00 |
jiaoyangna
|
35a048adc9
|
id1017799
|
2021-07-28 11:06:33 +08:00 |
jiaoyangna
|
527295f30c
|
宝物优化
|
2021-07-28 10:51:39 +08:00 |
zhangqiang
|
e54a17decb
|
【魂印穿戴】点击魂印不穿戴,魂印在列表中消失
|
2021-07-28 10:51:35 +08:00 |
ZhangBiao
|
c8d35b5458
|
【星魂福袋】点击使用数量加号,提示英雄达上限 修复
|
2021-07-28 09:58:41 +08:00 |
jiaoyangna
|
88df4dbde8
|
为装备的宝物点击报错修改提交
|
2021-07-28 09:48:08 +08:00 |
jiaoyangna
|
d1845618d1
|
宝物可强化时,TIPS上的【强化】按钮未显示红点,精炼功能有相同问题
|
2021-07-27 18:53:36 +08:00 |
jiaoyangna
|
94c92a7f22
|
拥有可替换/战斗力较高的宝物时,应在宝物图标右上角,及下方的魂宝/灵宝按钮上显示红点,不应当在魂宝/灵宝装备格子上显示红点
|
2021-07-27 18:34:37 +08:00 |
jiaoyangna
|
d4126bb634
|
宝物培养修改
|
2021-07-27 14:39:48 +08:00 |
jiaoyangna
|
7225723b34
|
引导修改提交
|
2021-07-27 10:25:42 +08:00 |
gaoxin
|
d4e78afcab
|
【packID】数数打点新增字段
|
2021-07-27 10:04:22 +08:00 |
ZhangBiao
|
509f34e19b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-26 19:00:55 +08:00 |
ZhangBiao
|
74c713c65b
|
【主题活动】加强限时商市,珍奇宝阁入口按钮的辨识度
|
2021-07-26 19:00:41 +08:00 |
jiaoyangna
|
917662ff20
|
宝物培养红点提交
|
2021-07-26 17:16:29 +08:00 |
jiaoyangna
|
efc0f62cc5
|
【ID1017708】
【无尽副本】购买秘宝后等待下一期秘宝刷新,上一期购买秘宝获得的积分不清,导致下期秘宝无法正常领取奖励
(cherry picked from commit 76fad397de)
|
2021-07-26 16:06:21 +08:00 |
jiaoyangna
|
825c38fc0d
|
红点修改提交
(cherry picked from commit c546710d1f)
|
2021-07-26 15:19:57 +08:00 |
jiaoyangna
|
c546710d1f
|
红点修改提交
|
2021-07-26 15:18:49 +08:00 |
ZhangBiao
|
07de90eb45
|
【提交】
|
2021-07-26 15:07:49 +08:00 |
ZhangBiao
|
da34a5834b
|
【主题活动】时间显示调整
|
2021-07-26 14:36:58 +08:00 |
ZhangBiao
|
1ba38242ad
|
【主题活动】提交
|
2021-07-26 12:29:13 +08:00 |
zhangqiang
|
71f7e8a469
|
Merge branch 'china/dev' into china/jumpserver
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
|
2021-07-27 11:26:30 +08:00 |
gaoxin
|
3e11938166
|
【meta】
|
2021-07-27 10:06:56 +08:00 |
jiaoyangna
|
76fad397de
|
【ID1017708】
【无尽副本】购买秘宝后等待下一期秘宝刷新,上一期购买秘宝获得的积分不清,导致下期秘宝无法正常领取奖励
|
2021-07-26 11:23:26 +08:00 |
JieLing
|
d2090cb930
|
【跨服】修复角色信息英雄详细信息报错
|
2021-07-26 11:10:11 +08:00 |
ZhangBiao
|
11543e53a0
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-26 11:09:20 +08:00 |
ZhangBiao
|
beea770b78
|
【竞技场】适配调整
|
2021-07-26 11:09:07 +08:00 |
zhangqiang
|
e01694fa28
|
【跨服天梯】战斗记录协议修改
|
2021-07-26 11:03:45 +08:00 |
jiaoyangna
|
9a1d361c63
|
Revert "装备界面改动"
This reverts commit c131d41d58.
|
2021-07-26 10:03:10 +08:00 |
jiaoyangna
|
4590076eb9
|
Revert "宝物培养修改提交"
This reverts commit bcd0651029.
|
2021-07-26 10:00:59 +08:00 |
jiaoyangna
|
4c9871767f
|
Revert "强化和精炼界面修改"
This reverts commit 9d78af51e0.
|
2021-07-26 10:00:49 +08:00 |
jiaoyangna
|
d53776b558
|
Revert "红点修改提交"
This reverts commit 734efe7b52.
|
2021-07-26 10:00:07 +08:00 |
jiaoyangna
|
c93f98dabc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-26 09:55:42 +08:00 |
ZhangBiao
|
1634345c1e
|
【清除log】
|
2021-07-26 09:48:18 +08:00 |
jiaoyangna
|
b49166afe1
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-24 19:39:25 +08:00 |
jiaoyangna
|
734efe7b52
|
红点修改提交
|
2021-07-24 19:36:34 +08:00 |
ZhangBiao
|
7111f53936
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-24 19:34:13 +08:00 |
ZhangBiao
|
7e9fad28b7
|
【万象商会】提交
|
2021-07-24 19:33:56 +08:00 |
jiaoyangna
|
06dfb74d33
|
活动修改提交
|
2021-07-24 19:33:54 +08:00 |
jiaoyangna
|
e5d387c37d
|
主题活动任务修改提交
|
2021-07-24 19:07:56 +08:00 |
jiaoyangna
|
7b9a5e535c
|
红点检测修改提交
|
2021-07-24 18:16:05 +08:00 |
jiaoyangna
|
8d76903f10
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-24 18:13:45 +08:00 |
jiaoyangna
|
8226901eb8
|
任务修改提交
|
2021-07-24 18:13:40 +08:00 |
ZhangBiao
|
5bba13ccc0
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-24 17:46:03 +08:00 |
ZhangBiao
|
9a7ef2f0a2
|
【轩辕宝境】从任意一个宝境里返回轩辕宝境主界面,顶部资源条消失
|
2021-07-24 17:45:48 +08:00 |
jiaoyangna
|
1e70bdb2ca
|
活动修改提交
|
2021-07-24 17:38:48 +08:00 |
jiaoyangna
|
9d78af51e0
|
强化和精炼界面修改
|
2021-07-24 16:22:16 +08:00 |
jiaoyangna
|
24363d5c03
|
【ID1009862】
15日登录送白泽活动加入预告功能
|
2021-07-24 15:46:00 +08:00 |
jiaoyangna
|
6c59983568
|
工会查看信息报错修改
|
2021-07-24 15:18:38 +08:00 |
ZhangBiao
|
7bc3a3d460
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-23 19:23:05 +08:00 |
ZhangBiao
|
c3a5e5b7de
|
【主题活动】bannerSetNative
|
2021-07-23 19:22:56 +08:00 |
jiaoyangna
|
fd7d51168d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-23 19:12:46 +08:00 |
jiaoyangna
|
bcd0651029
|
宝物培养修改提交
|
2021-07-23 19:12:42 +08:00 |
ZhangBiao
|
38bbb808b4
|
【主题活动】商店
|
2021-07-23 19:05:53 +08:00 |
wangzhenxing
|
ff6639ebfb
|
【称号】=====称号属性显示修改
|
2021-07-23 18:34:07 +08:00 |
zhangqiang
|
3d13fbca6d
|
【拍脸修改】回退
|
2021-07-23 17:51:22 +08:00 |
ZhangBiao
|
8a90b87942
|
【新副本界面】心魔次数文字错误修改,和弹窗修改
|
2021-07-23 17:43:30 +08:00 |
ZhangBiao
|
627954ae3f
|
【大闹天宫】层数错误提交
|
2021-07-23 17:26:24 +08:00 |
ZhangBiao
|
2dc965137b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-23 17:15:15 +08:00 |
ZhangBiao
|
93469872a7
|
【主题活动】提交
|
2021-07-23 17:15:04 +08:00 |
zhangqiang
|
beb91b9407
|
【拍脸报错】
|
2021-07-23 16:43:51 +08:00 |
wangzhenxing
|
3dc2970f1f
|
[功能]============15日登陆预告预设修改,整点自动刷新
|
2021-07-23 16:27:33 +08:00 |
ZhangBiao
|
bd5b473246
|
【大闹天宫】增加层数显示
|
2021-07-23 15:55:49 +08:00 |
ZhangBiao
|
31e8aa5d00
|
【山河社稷图】关闭关卡界面入口
|
2021-07-23 15:22:51 +08:00 |
ZhangBiao
|
3eee03aca7
|
【新副本界面】等级提示错误修复
|
2021-07-23 14:55:33 +08:00 |
wangzhenxing
|
79a1a5acc0
|
[功能]============称号显示修改
|
2021-07-23 14:15:53 +08:00 |
ZhangBiao
|
dc4fbe89e5
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-23 14:11:50 +08:00 |
ZhangBiao
|
b5fd7ba8f6
|
【新副本界面】刷新时间和引导修改
|
2021-07-23 14:11:29 +08:00 |
jiaoyangna
|
92738c45a7
|
超值基金红点修改
|
2021-07-23 13:48:07 +08:00 |
jiaoyangna
|
ffeacc6bf0
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-23 13:45:43 +08:00 |
jiaoyangna
|
4af32b0a85
|
超值基金红点修改提交
|
2021-07-23 13:45:40 +08:00 |
zhangqiang
|
731715ed35
|
【功能引导】幸运探宝开启,界面不会自动切换到幸运探宝入口
|
2021-07-23 13:43:34 +08:00 |
DESKTOP-98AVA47\Administrator
|
ce89a20050
|
活动时间修改
|
2021-07-23 11:47:15 +08:00 |
DESKTOP-98AVA47\Administrator
|
7703a9e740
|
红点修改提交
|
2021-07-23 11:45:13 +08:00 |
DESKTOP-98AVA47\Administrator
|
022681face
|
红点修改提交
|
2021-07-23 11:36:44 +08:00 |
ZhangBiao
|
2164685f0c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-23 11:27:38 +08:00 |
ZhangBiao
|
8981c707ba
|
【主题活动】分页提交
|
2021-07-23 11:27:28 +08:00 |
wangzhenxing
|
02cea65055
|
[称号]====跨服称号资源提交
|
2021-07-23 11:20:05 +08:00 |
DESKTOP-98AVA47\Administrator
|
6986b0d3a1
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-23 11:17:53 +08:00 |
DESKTOP-98AVA47\Administrator
|
6f8cb042bb
|
报错修改提交
|
2021-07-23 11:17:50 +08:00 |
wangzhenxing
|
d0d533cecc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-23 11:08:03 +08:00 |
wangzhenxing
|
f7029c2ef0
|
[功能]==============15日登陆添加 预告
|
2021-07-23 11:07:46 +08:00 |
zhangqiang
|
350f13371a
|
【逍遥游】掉落问题修改
|
2021-07-23 10:58:13 +08:00 |
DESKTOP-98AVA47\Administrator
|
01f9ec621d
|
【ID1009871】
【点将台】调整神将召唤、友情召唤和普通召唤的顺序
|
2021-07-22 20:25:32 +08:00 |
DESKTOP-98AVA47\Administrator
|
875325fabb
|
【ID1009871】
【点将台】调整神将召唤、友情召唤和普通召唤的顺序
|
2021-07-22 20:03:03 +08:00 |
DESKTOP-98AVA47\Administrator
|
25aed04450
|
报错修改
|
2021-07-22 19:55:19 +08:00 |
DESKTOP-98AVA47\Administrator
|
f676618e42
|
【ID1009871】
【点将台】调整神将召唤、友情召唤和普通召唤的顺序
|
2021-07-22 19:50:38 +08:00 |
gaoxin
|
0db39ccbe3
|
Merge branch 'china/ios' into china/dev
# Conflicts:
# Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/CarbonImg_monster 4.png.meta
|
2021-07-22 19:39:14 +08:00 |
gaoxin
|
a16d134d2d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-22 19:37:13 +08:00 |
gaoxin
|
a228c18c50
|
【MapPlayerView】随机使用lua原生的方法
|
2021-07-22 19:36:17 +08:00 |
gaoxin
|
9d7a51fd57
|
【容错】登录容错添加,服务器发送不存在的活动时,不再卡死
|
2021-07-22 19:35:22 +08:00 |
zhangqiang
|
c3b68ef28a
|
【跨服】修改跨服排行未解锁提示文字
|
2021-07-22 19:30:53 +08:00 |
zhangqiang
|
1cf142c82b
|
【跨服天梯】国内提交+1
|
2021-07-22 19:01:46 +08:00 |
ZhangBiao
|
1e822443f9
|
Merge branch '0优化/副本界面' into china/dev
|
2021-07-22 18:19:42 +08:00 |
ZhangBiao
|
b0d10a29d2
|
【公会】公会按钮位置调整
|
2021-07-22 17:41:01 +08:00 |
luyao
|
5555f33715
|
玲珑宝镜音效修改提交
|
2021-07-22 17:25:17 +08:00 |
ZhangBiao
|
056d3dc094
|
Merge branch 'china/dev' into 0优化/副本界面
|
2021-07-22 17:01:32 +08:00 |
DESKTOP-98AVA47\Administrator
|
1c75527f36
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-22 16:41:13 +08:00 |
DESKTOP-98AVA47\Administrator
|
2424a8090b
|
添加玲珑宝镜音效
|
2021-07-22 16:40:53 +08:00 |