jiaoyangna
|
7f46481dbf
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-02 11:04:24 +08:00 |
jiaoyangna
|
3c67abbd6d
|
四元阵闪现人物立绘修改
|
2021-08-02 11:04:19 +08:00 |
ZhangBiao
|
d7727ac9e3
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-02 10:34:27 +08:00 |
ZhangBiao
|
851059fe4d
|
【点将台】适配修改
|
2021-08-02 10:34:21 +08:00 |
gaoxin
|
e1d2ca80db
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-02 10:22:14 +08:00 |
gaoxin
|
7d1c748a75
|
【热更工具】文件大小显示错误
|
2021-08-02 10:22:00 +08:00 |
ZhangBiao
|
247ca489d4
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-02 10:11:47 +08:00 |
gaoxin
|
b845c0bece
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-02 10:11:24 +08:00 |
ZhangBiao
|
73499d1b2f
|
【btview】修改判定区域
|
2021-08-02 10:11:19 +08:00 |
gaoxin
|
09ab5dea99
|
【热更工具】文件大小保留两位xiaoshu
|
2021-08-02 10:11:14 +08:00 |
ZhangBiao
|
2ac511bf06
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-02 10:07:22 +08:00 |
ZhangBiao
|
807cca92ce
|
【天枢密卷】适配调整
|
2021-08-02 10:07:14 +08:00 |
gaoxin
|
e3730ac549
|
【热更工具】更新列表显示每个文件的大小
|
2021-08-02 10:06:33 +08:00 |
zhangqiang
|
acf647d9c5
|
【罗浮争锋】
|
2021-07-31 17:20:07 +08:00 |
gaoxin
|
a96b609a49
|
【森罗幻境】修复未开启时红点方法报错
|
2021-07-31 16:49:28 +08:00 |
gaoxin
|
de1d879717
|
【聊天】修改公会和跨服频道的未解锁提示内容
|
2021-07-31 16:25:43 +08:00 |
gaoxin
|
0cd58e9f6d
|
【巅峰赛】未开放状态不可进入
|
2021-07-31 16:10:57 +08:00 |
gaoxin
|
066f603cb1
|
Merge branch 'gx/packID打点' into china/dev
|
2021-07-31 16:03:07 +08:00 |
gaoxin
|
96adf23ab2
|
【http请求】请求报错日志打印优化
|
2021-07-31 16:02:49 +08:00 |
gaoxin
|
7757dc2f1e
|
【热更配置】添加跨服测试热更配置
|
2021-07-31 15:59:48 +08:00 |
gaoxin
|
1006de499c
|
【巅峰赛】添加未解锁状态显示
|
2021-07-31 15:59:14 +08:00 |
zhangqiang
|
18dd4832a6
|
【资源冲突】
|
2021-07-31 13:45:59 +08:00 |
zhangqiang
|
fa203e1dc8
|
【跨服排行】
|
2021-07-30 19:20:53 +08:00 |
zhangqiang
|
c1e192943c
|
【排行榜】踏碎凌霄称号大小修改
|
2021-07-30 18:29:44 +08:00 |
jiaoyangna
|
36e28866ed
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-30 17:58:59 +08:00 |
jiaoyangna
|
2ecffb1b10
|
宝物培养位置修改
|
2021-07-30 17:58:47 +08:00 |
zhangqiang
|
d731f30dec
|
【巅峰赛】背景
|
2021-07-30 17:57:43 +08:00 |
zhangqiang
|
98649b66c1
|
【跨服排行】
|
2021-07-30 17:52:49 +08:00 |
ZhangBiao
|
92f3ee123c
|
【升星有礼】界面调整
|
2021-07-30 17:51:25 +08:00 |
ZhangBiao
|
e829b33d14
|
【万象商会】白篇处理
|
2021-07-30 16:34:50 +08:00 |
ZhangBiao
|
5f994f6abc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-30 16:23:26 +08:00 |
ZhangBiao
|
a40ccb1510
|
【新将来袭、降妖夺宝】增加按钮特效
|
2021-07-30 16:22:59 +08:00 |
wangzhenxing
|
fdfa2dd76b
|
[战斗]============追加额外技能是否触发特性修改,哪吒大招后摇时间延长
|
2021-07-30 16:03:22 +08:00 |
zhangqiang
|
80392134af
|
【跨服排行】红点显示修改
|
2021-07-30 15:57:11 +08:00 |
gaoxin
|
ba35814301
|
【跨服聊天】未在跨服阶段不可进入跨服频道
|
2021-07-30 15:38:57 +08:00 |
jiaoyangna
|
aec7bb6843
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-30 15:29:44 +08:00 |
jiaoyangna
|
06829b685e
|
【ID1017646】
【适配】1080*2550 屏幕显示不全
|
2021-07-30 15:29:40 +08:00 |
zhangqiang
|
c0243afe6c
|
【跨服分组】推送
|
2021-07-30 15:14:52 +08:00 |
jiaoyangna
|
c6c11c9374
|
宝物消耗震动修改
|
2021-07-30 15:11:56 +08:00 |
jiaoyangna
|
83f2a96c34
|
做个容错
|
2021-07-30 14:39:10 +08:00 |
jiaoyangna
|
9266d81377
|
【ID1009852】
四元阵界面优化,修改新手指引的抽卡位置
|
2021-07-30 14:30:10 +08:00 |
jiaoyangna
|
0ed878daac
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-30 14:17:55 +08:00 |
jiaoyangna
|
aa82fc9f6b
|
震动效果修改
|
2021-07-30 14:17:44 +08:00 |
gaoxin
|
4d8ab5dd7e
|
【跨服聊天】关闭服务器名称显示
|
2021-07-30 14:11:50 +08:00 |
gaoxin
|
28d00ec69a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-30 14:07:36 +08:00 |
gaoxin
|
5aadeb406b
|
【聊天】聊天框根据内容跳转到不同的频道
|
2021-07-30 14:07:08 +08:00 |
jiaoyangna
|
3c012bb3f4
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-30 14:05:09 +08:00 |
jiaoyangna
|
9ce0dcbf75
|
返回界面装备显示错误修改
|
2021-07-30 14:05:06 +08:00 |
gaoxin
|
aece2194b5
|
【跨服聊天】添加服务器名显示
|
2021-07-30 13:47:03 +08:00 |
zhangqiang
|
78ec831ca1
|
【跨服详情】修改提交
|
2021-07-30 11:59:39 +08:00 |
jiaoyangna
|
c81dbd604d
|
删除宝器的点击事件
|
2021-07-30 11:35:06 +08:00 |
wangzhenxing
|
d6f8875ee7
|
[称号]======罗浮之主称号特效闪烁问题修改
|
2021-07-30 10:46:32 +08:00 |
zhangqiang
|
695183cec8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-30 10:33:49 +08:00 |
zhangqiang
|
580b43eff8
|
跨服排行榜里,查看玩家信息,战力显示超框问题
|
2021-07-30 10:33:29 +08:00 |
jiaoyangna
|
a7b8bb88fc
|
四元阵适配修改
|
2021-07-30 10:29:55 +08:00 |
jiaoyangna
|
19628fdcbd
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-30 10:25:32 +08:00 |
jiaoyangna
|
89cf45bf35
|
四元阵适配修改
|
2021-07-30 10:25:29 +08:00 |
zhangqiang
|
23d4f9548f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-30 10:21:45 +08:00 |
zhangqiang
|
edbfbc9afc
|
【主城优化】跨服战入口变更位置
|
2021-07-30 10:20:35 +08:00 |
jiaoyangna
|
8c0060a835
|
四元阵动画播两遍修改
|
2021-07-30 10:00:26 +08:00 |
gaoxin
|
f5584b0fbe
|
【巅峰赛】添加未开放状态兼容处理
|
2021-07-29 20:00:02 +08:00 |
jiaoyangna
|
f73a554f35
|
宝物震动修改
|
2021-07-29 18:57:30 +08:00 |
jiaoyangna
|
7af6aa20da
|
宝物引导提交
|
2021-07-29 18:53:00 +08:00 |
jiaoyangna
|
97c5e11f5c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-29 18:36:45 +08:00 |
jiaoyangna
|
0480506f53
|
【ID1009852】
四元阵界面优化,修改新手指引的抽卡位置
|
2021-07-29 18:36:30 +08:00 |
gaoxin
|
5594474379
|
【累充】白片恢复
|
2021-07-29 18:05:44 +08:00 |
wangzhenxing
|
31c19def0a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-29 17:34:55 +08:00 |
wangzhenxing
|
d8801cae6c
|
[称号]=============添加罗浮争锋称号 获得 及 到时 后消息推送
|
2021-07-29 17:34:40 +08:00 |
ZhangBiao
|
3cdce73c69
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-29 17:12:31 +08:00 |
ZhangBiao
|
bc46019646
|
【战令优化】无尽副本任务数量冗余修改
|
2021-07-29 17:12:21 +08:00 |
zhangqiang
|
8b56e352ba
|
【跨服排行榜】
|
2021-07-29 17:11:10 +08:00 |
zhangqiang
|
529f8e3bd2
|
【协议提交】
|
2021-07-29 16:45:06 +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
|
becf23c1af
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-29 16:35:25 +08:00 |
jiaoyangna
|
283f9d209a
|
魂印圈圈错误修改
|
2021-07-29 16:35:20 +08:00 |
wangzhenxing
|
8c1130e89f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-29 16:20:02 +08:00 |
wangzhenxing
|
126eba3f26
|
[称号]==========罗浮争锋三个称号特效预设修改
|
2021-07-29 16:19:48 +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
|
44119d5a28
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-29 15:21:48 +08:00 |
jiaoyangna
|
01632378f6
|
魂印分解界面修改
|
2021-07-29 15:21:44 +08:00 |
ZhangBiao
|
c6598ecff4
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-29 15:03:54 +08:00 |
ZhangBiao
|
49d4336f38
|
【限时召唤优化】调整适配,使部分屏幕内隐藏的召唤次数上限显示出来
|
2021-07-29 15:03:39 +08:00 |
jiaoyangna
|
856f03b494
|
【ID1017815】
【魂印分解】一键选择,优先选择了品质高的魂印
|
2021-07-29 15:01:58 +08:00 |
jiaoyangna
|
1cff130e45
|
【ID1017827】
【心魔试炼】dev分支心魔试炼界面底部白边
|
2021-07-29 14:38:13 +08:00 |
jiaoyangna
|
548e43b486
|
共鸣中去掉一键装备红点
|
2021-07-29 14:33:52 +08:00 |
jiaoyangna
|
2f47e10caf
|
重置提交
|
2021-07-29 14:20:51 +08:00 |
jiaoyangna
|
9a87435469
|
【ID1017808】
【天书秘卷】适配错误,文字超出显示区域
|
2021-07-29 14:16:07 +08:00 |
jiaoyangna
|
8ad1911755
|
文字大小调整
|
2021-07-29 13:55:50 +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 |
jiaoyangna
|
f50caf3ff5
|
清理空文件夹
|
2021-07-29 11:28:30 +08:00 |
jiaoyangna
|
43c4c159ed
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-29 11:27:42 +08:00 |
jiaoyangna
|
dd076dfb6a
|
立绘删除
|
2021-07-29 11:25:36 +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
|
2a31ef09ce
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-29 11:11:43 +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 |
jiaoyangna
|
78c982e740
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-28 18:39:16 +08:00 |
jiaoyangna
|
bac3e3dfa9
|
动画提交
|
2021-07-28 18:39:05 +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
|
957513db52
|
添加一些log
|
2021-07-28 17:41:48 +08:00 |
jiaoyangna
|
0d16b1511a
|
资源删除工具修改提交
|
2021-07-28 17:26:13 +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
|
68e3a32140
|
[bug]====称号层级修改
|
2021-07-28 16:41:37 +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 |
gaoxin
|
d7009c9950
|
【热更配置】添加动游和灵动商务服热更配置
|
2021-07-28 15:32:08 +08:00 |
ZhangBiao
|
263cb18d03
|
【车迟斗法】玩法内等待次数刷新,红点不显示,退出重进显示正常 修复
|
2021-07-28 15:16:10 +08:00 |
jiaoyangna
|
4805b041e8
|
宝物使用跳转错误修改
|
2021-07-28 15:07:57 +08:00 |
ZhangBiao
|
87e8496df0
|
【适配】优化神将升星提示在长屏手机的适配效果
|
2021-07-28 14:49:21 +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 |
liujiaqi
|
dab4dc03fb
|
【资源】误删资源回滚
|
2021-07-28 11:10:14 +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 |
zhangqiang
|
0204573ad9
|
【玩家信息】跨服排行榜里,查看玩家信息,战力显示超框问题
|
2021-07-28 10:52:49 +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 |