jiaoyangna
|
4fe156364d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-12 11:41:37 +08:00 |
jiaoyangna
|
025583762d
|
十绝阵修改
|
2021-08-12 11:36:48 +08:00 |
jiaoyangna
|
ce4a166777
|
Revert "跨服十绝阵修改提交"
This reverts commit 657690cf3f.
|
2021-08-12 11:22:05 +08:00 |
jiaoyangna
|
657690cf3f
|
跨服十绝阵修改提交
|
2021-08-12 11:18:43 +08:00 |
jiaoyangna
|
792b533fa0
|
太初秘卷修改提交
|
2021-08-12 11:02:21 +08:00 |
jiaoyangna
|
f45b61adba
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-12 10:55:15 +08:00 |
jiaoyangna
|
16fc435113
|
跨服十绝阵修改提交
|
2021-08-12 10:55:05 +08:00 |
zhangqiang
|
c0c3013e2f
|
【大闹天宫】角色爬塔,界面不会跟随显示
|
2021-08-11 21:21:11 +08:00 |
ZhangBiao
|
13777a78cb
|
【寻宝迷踪】增加主角箭头
|
2021-08-11 19:33:01 +08:00 |
ZhangBiao
|
4632665c49
|
【寻宝迷踪】拼图合成特效+小人落地特效
|
2021-08-11 17:53:59 +08:00 |
jiaoyangna
|
b83ee5e000
|
太初秘卷修改
|
2021-08-11 17:14:20 +08:00 |
jiaoyangna
|
c3d45f1316
|
【ID1010059】
【新功能】太初密卷
|
2021-08-11 15:15:41 +08:00 |
ZhangBiao
|
939d577624
|
Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
|
2021-08-10 20:21:06 +08:00 |
ZhangBiao
|
88c2e3984e
|
【寻宝迷踪】增加进入地图黑边效果
|
2021-08-10 20:20:55 +08:00 |
ZhangBiao
|
6e9136aa14
|
【寻宝密宗】增加QA
|
2021-08-10 16:17:28 +08:00 |
ZhangBiao
|
d017873b79
|
【寻宝迷踪】提交
|
2021-08-10 15:27:32 +08:00 |
zhangqiang
|
36ec633294
|
【公会红包】有动画时点赞按钮显示位置不对 解决方法 缩放去掉动画
|
2021-08-10 15:18:13 +08:00 |
ZhangBiao
|
edc728227c
|
【寻宝密宗】提交
|
2021-08-10 14:57:45 +08:00 |
zhangqiang
|
5e891ff84b
|
【鸿蒙阵】步骤:共鸣效果100级,上阵共鸣神将,在化虚坛中进阶该神将,进阶后在鸿蒙阵把该神将卸下,并在神将情报界面升级,升级后重登,还原错误的天赋,但保留错误的等级
|
2021-08-10 14:56:34 +08:00 |
zhangqiang
|
0e0d5ffdb0
|
【鸿蒙阵】步骤:共鸣效果100级,上阵共鸣神将,在化虚坛中进阶该神将,进阶后在鸿蒙阵把该神将卸下,并在神将情报界面升级,升级后重登,还原错误的天赋,但保留错误的等级
|
2021-08-10 14:52:07 +08:00 |
ZhangBiao
|
d7aa6d66f9
|
【无尽副本】特效穿透提交
|
2021-08-09 17:35:22 +08:00 |
ZhangBiao
|
ed0f5296d1
|
【寻宝迷踪】提交
|
2021-08-09 17:11:30 +08:00 |
gaoxin
|
54c0a74afa
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-09 16:52:33 +08:00 |
gaoxin
|
b0d5798448
|
【登录】维护状态提示文字修改
|
2021-08-09 16:52:21 +08:00 |
jiaoyangna
|
615cc24f09
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-09 16:50:04 +08:00 |
jiaoyangna
|
278530583d
|
牛气冲天跳转返回之后页签跳到第一个修改
|
2021-08-09 16:49:41 +08:00 |
gaoxin
|
8e43418825
|
【服务器】服务器选择界面每次打开时都重新获取一遍服务器列表数据
|
2021-08-09 16:32:14 +08:00 |
gaoxin
|
c4c57893ea
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-09 16:31:24 +08:00 |
jiaoyangna
|
dfb6132bc5
|
牛气冲天跳转神将抽卡
|
2021-08-09 16:21:46 +08:00 |
jiaoyangna
|
cef09d39d8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-09 16:14:35 +08:00 |
jiaoyangna
|
206fd6793b
|
牛气冲天跳转点将台修改提交
|
2021-08-09 16:13:24 +08:00 |
gaoxin
|
639dbcac80
|
【服务器】选择服务器时维护状态提示文字修改
|
2021-08-09 16:13:20 +08:00 |
zhangqiang
|
c957a96983
|
【玩家信息】玩家信息面板需要显示神将佩戴宝物的强化等级和精炼等级
|
2021-08-09 14:48:14 +08:00 |
ZhangBiao
|
aae540d144
|
【寻宝迷踪】提交
|
2021-08-09 14:18:31 +08:00 |
gaoxin
|
ac8927f4e6
|
【登录】修改服务器维护状态下,登录时的提示文字
|
2021-08-09 14:10:54 +08:00 |
ZhangBiao
|
0520c4c685
|
Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
|
2021-08-09 10:01:11 +08:00 |
jiaoyangna
|
97de80b9cd
|
图鉴提交
|
2021-08-06 17:19:44 +08:00 |
jiaoyangna
|
1adf97eddc
|
四元阵适配修改
|
2021-08-06 16:56:26 +08:00 |
ZhangBiao
|
f40d297086
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-06 14:21:48 +08:00 |
ZhangBiao
|
87b7f4d7c8
|
【天宫秘宝】礼包购买逻辑修复
|
2021-08-06 14:21:27 +08:00 |
ZhangBiao
|
ab0dece261
|
Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
|
2021-08-06 11:32:10 +08:00 |
ZhangBiao
|
4dc9136405
|
【寻宝迷踪】提交
|
2021-08-06 11:31:41 +08:00 |
ZhangBiao
|
4edc9a855b
|
【寻宝迷踪】提交
|
2021-08-05 17:23:25 +08:00 |
gaoxin
|
360cbbf54f
|
【公告】报错修改
|
2021-08-05 16:34:05 +08:00 |
jiaoyangna
|
5336505935
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-05 15:10:04 +08:00 |
jiaoyangna
|
ed3494e263
|
【ID1009947】
【优化】四元阵界面 新增界面特效
|
2021-08-05 15:09:58 +08:00 |
gaoxin
|
597a747848
|
【公告】公告分包配置参数,PackID将代替SubNoticeID,对外将不再提供SubNoticeID的配置
|
2021-08-05 14:41:19 +08:00 |
gaoxin
|
59afbd6773
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-05 14:39:44 +08:00 |
gaoxin
|
0f5e66cfea
|
【公告】公告显隐改为config文件配置
|
2021-08-05 14:39:39 +08:00 |
ZhangBiao
|
d86921d5a3
|
【降妖夺宝】次数修改提交
|
2021-08-05 14:33:07 +08:00 |
ZhangBiao
|
1c0880abbf
|
【寻宝迷踪】
|
2021-08-05 14:31:31 +08:00 |
ZhangBiao
|
9bd336158d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-04 18:47:09 +08:00 |
ZhangBiao
|
cad9409314
|
【万象商会】upview调整
|
2021-08-04 18:46:59 +08:00 |
zhangqiang
|
1e4b55d9fd
|
【修改协议请求】修改进入游戏会向后的发送更换 称号 皮肤 坐骑 请求
|
2021-08-04 17:53:30 +08:00 |
zhangqiang
|
3cf8a5d2ce
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-04 17:43:11 +08:00 |
zhangqiang
|
abb9873f80
|
【玩家信息】玩家信息面板需要显示神将佩戴宝物的强化等级和精炼等级
|
2021-08-04 17:42:47 +08:00 |
ZhangBiao
|
c85cc55432
|
Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
|
2021-08-04 17:24:03 +08:00 |
ZhangBiao
|
50cbd0ea50
|
【灵兽山】增加灵兽界面跳转
|
2021-08-04 16:58:19 +08:00 |
ZhangBiao
|
2ba5a58a3f
|
【紫府神印】增加预览功能
|
2021-08-04 14:55:24 +08:00 |
ZhangBiao
|
3b86f741ee
|
【适配】增加限时兑换按钮特效
|
2021-08-03 18:06:02 +08:00 |
gaoxin
|
51e4e3206c
|
【成就提示】修复心魔快速战斗结算界面,通过成就跳转领取成就奖励后卡死的问题
|
2021-08-03 15:24:49 +08:00 |
jiaoyangna
|
fabd517c04
|
【ID1017608】
【点将台】点击箭头,当切换页面大于2个时,会出现明显未对准后校准状态
|
2021-08-03 12:03:07 +08:00 |
zhangqiang
|
0de6e3f63a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-03 11:00:06 +08:00 |
zhangqiang
|
8ef10cb100
|
【主城小人层级】
|
2021-08-03 10:59:41 +08:00 |
ZhangBiao
|
fef7ea4d0b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-03 10:39:57 +08:00 |
ZhangBiao
|
53dc964596
|
【十绝阵】主界面倒计时超框修改
|
2021-08-03 10:39:40 +08:00 |
zhangqiang
|
3c899d20d5
|
【主城】主城小人层级错误
|
2021-08-03 10:36:55 +08:00 |
ZhangBiao
|
06569c49c2
|
Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
|
2021-08-03 10:28:09 +08:00 |
ZhangBiao
|
28b794eea2
|
【寻宝迷踪】开坑
|
2021-08-03 10:27:36 +08:00 |
zhangqiang
|
0ab8247704
|
【跨服排行榜】修改
|
2021-08-03 10:12:54 +08:00 |
gaoxin
|
35b9a89503
|
Merge branch 'gx/充值前校验' into china/dev
|
2021-08-02 19:24:53 +08:00 |
gaoxin
|
2df20e2f91
|
【充值】充值前先请求订单号,并通过透传参数传递给后端
|
2021-08-02 19:24:44 +08:00 |
gaoxin
|
ac62390992
|
Revert "Revert "[战斗]========服务器发送随机种子修改""
This reverts commit 0b827be035.
|
2021-08-02 19:22:05 +08:00 |
gaoxin
|
0b827be035
|
Revert "[战斗]========服务器发送随机种子修改"
This reverts commit 331621bfd0.
|
2021-08-02 18:26:33 +08:00 |
gaoxin
|
bd85be16d2
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-02 17:48:34 +08:00 |
gaoxin
|
cd5ee0a6e0
|
【挂机奖励】修复满级后领取挂机奖励会弹出升级提示的问提
|
2021-08-02 17:47:43 +08:00 |
zhangqiang
|
14d50731a8
|
【十绝阵】显示修改 罗浮争锋 适配
|
2021-08-02 17:35:27 +08:00 |
wangzhenxing
|
331621bfd0
|
[战斗]========服务器发送随机种子修改
|
2021-08-02 16:46:54 +08:00 |
gaoxin
|
64077a2e28
|
【跨服聊天】重新分配跨服分组时,清空跨服聊天
|
2021-08-02 16:25:08 +08:00 |
gaoxin
|
54448208df
|
【切磋】战斗界面重复打开容错添加
|
2021-08-02 15:33:50 +08:00 |
wangzhenxing
|
4358ef97e3
|
[bug]====聊天界面称号特效穿透问题修改
|
2021-08-02 14:27:13 +08:00 |
jiaoyangna
|
3c67abbd6d
|
四元阵闪现人物立绘修改
|
2021-08-02 11:04:19 +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
|
1006de499c
|
【巅峰赛】添加未解锁状态显示
|
2021-07-31 15:59:14 +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
|
98649b66c1
|
【跨服排行】
|
2021-07-30 17:52:49 +08:00 |
ZhangBiao
|
92f3ee123c
|
【升星有礼】界面调整
|
2021-07-30 17:51:25 +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 |
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 |
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 |
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 |
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
|
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 |