ZhangBiao
|
7d93e96d9b
|
【易经宝库】商店特效
|
2021-08-20 16:28:38 +08:00 |
wangzhenxing
|
9a02e18582
|
【战斗】==============被动 141 310 283 330 336 修改提交
|
2021-08-20 16:05:33 +08:00 |
ZhangBiao
|
6c2e75b384
|
Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
|
2021-08-20 14:40:19 +08:00 |
zhangqiang
|
864fd20aac
|
【神将召唤引导】当正好赶上两个神将加入卡池的时候,会有弹窗,但是弹窗蒙版会挡住引导按钮
|
2021-08-20 11:44:49 +08:00 |
zhangqiang
|
6ad43f93ed
|
【飘邈之旅】玩法入口文字错误
|
2021-08-20 10:56:14 +08:00 |
jiaoyangna
|
0a2b584ab0
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-19 16:44:25 +08:00 |
jiaoyangna
|
bb8ca3c5ca
|
四元阵跳转修改
|
2021-08-19 16:44:13 +08:00 |
wangzhenxing
|
0e16c34677
|
[优化]==========聊天界面称号特效显示修改
|
2021-08-19 14:27:56 +08:00 |
ZhangBiao
|
11b5425f8b
|
【灵兽分解】分解完碎片后,显示错误
|
2021-08-18 17:53:52 +08:00 |
ZhangBiao
|
52bf5c79f2
|
【寻宝迷踪】增加音效
|
2021-08-18 15:31:52 +08:00 |
ZhangBiao
|
06b3814099
|
Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
|
2021-08-18 13:44:39 +08:00 |
ZhangBiao
|
30afec1613
|
【寻宝迷踪】预设冲突重新提交
|
2021-08-18 13:43:44 +08:00 |
jiaoyangna
|
e2caaafbc5
|
删除log
|
2021-08-18 09:54:42 +08:00 |
ZhangBiao
|
2612c2e01e
|
Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-08-17 19:53:05 +08:00 |
jiaoyangna
|
bc4af2601b
|
红点修改提交
|
2021-08-17 17:41:00 +08:00 |
jiaoyangna
|
662a760eaf
|
【ID1018142】
【宝物】宝物分解界面,没有精炼加号,统一 一下
|
2021-08-17 17:31:53 +08:00 |
jiaoyangna
|
a23cd88b5b
|
【ID1018146】
【玲珑宝镜】外圈奖励显示10000与奖励预览不一致
|
2021-08-17 17:27:57 +08:00 |
jiaoyangna
|
faf7591cf5
|
玲珑宝镜修改
|
2021-08-17 17:14:03 +08:00 |
ZhangBiao
|
fab5388536
|
Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-08-17 13:47:27 +08:00 |
ZhangBiao
|
9971d286ea
|
【寻宝迷踪】人物箭头提交
|
2021-08-16 15:37:01 +08:00 |
jiaoyangna
|
7a6935eb42
|
太初秘卷修改提交
|
2021-08-16 14:45:13 +08:00 |
jiaoyangna
|
ab89dcfd17
|
去掉字符串前后空格
|
2021-08-16 14:22:58 +08:00 |
jiaoyangna
|
a9d05bf258
|
修改报错日志
|
2021-08-16 14:05:29 +08:00 |
jiaoyangna
|
847dd9a83b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-16 13:57:23 +08:00 |
jiaoyangna
|
74f1bc4d4f
|
太初秘卷适配修改提交
|
2021-08-16 13:57:13 +08:00 |
ZhangBiao
|
c5639ee2c7
|
【寻宝迷踪】提交
|
2021-08-16 11:55:50 +08:00 |
gaoxin
|
4d91c779c9
|
【神将升级】删除原用于防止升级超过突破等级的限制条件
|
2021-08-16 11:33:45 +08:00 |
jiaoyangna
|
51d1ea2524
|
太初秘卷图片修改
|
2021-08-16 11:25:45 +08:00 |
jiaoyangna
|
32aeee8180
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-16 10:46:45 +08:00 |
jiaoyangna
|
fc09ac3c00
|
玲珑宝镜修改提交
|
2021-08-16 10:46:35 +08:00 |
wangzhenxing
|
690db47d68
|
【战斗】=========复活,新灼烧特效预设提交
|
2021-08-25 14:37:10 +08:00 |
gaoxin
|
f778b03879
|
【打开网页】添加打开内置浏览器和外部浏览器的配置,解决老包无法打开网页的问题
|
2021-08-25 14:27:08 +08:00 |
zhangqiang
|
dd37961be0
|
【跨服十绝阵】 回退特殊处理
|
2021-08-25 13:53:40 +08:00 |
gaoxin
|
7efb32c51c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-25 07:25:44 +08:00 |
gaoxin
|
642ea1f7cd
|
【太初密卷】喜扑和动游渠道关闭
|
2021-08-25 07:25:38 +08:00 |
zhangqiang
|
256a3e7571
|
【十绝阵】跨服服务器名字显示
|
2021-08-24 18:23:32 +08:00 |
ZhangBiao
|
d94d02849d
|
【寻宝迷踪】寻宝按钮特效增加
|
2021-08-13 17:46:58 +08:00 |
zhangqiang
|
617d4d39c3
|
【十绝阵】排行榜修改
|
2021-08-13 16:35:33 +08:00 |
ZhangBiao
|
57cdcc0809
|
【寻宝迷踪】增加到达特效
|
2021-08-13 15:34:06 +08:00 |
ZhangBiao
|
17afa71bd2
|
【修行】预览调整 【魂灵宝】属性调整
|
2021-08-13 14:06:35 +08:00 |
zhangqiang
|
f3e3cf9156
|
【修行预览
|
2021-08-13 13:37:24 +08:00 |
zhangqiang
|
33bbaf3cf9
|
【修行】预览增加星数,魂灵宝
|
2021-08-13 13:32:59 +08:00 |
zhangqiang
|
edcd105a68
|
【灵兽信息】未获得的灵兽查看信息增加技能详细查看和等级信息
|
2021-08-13 10:31:53 +08:00 |
ZhangBiao
|
e678864743
|
【魂灵宝】装备界面增加等级上限
|
2021-08-12 20:01:56 +08:00 |
jiaoyangna
|
9c5850a2a5
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-12 18:35:56 +08:00 |
jiaoyangna
|
39f355c0d1
|
适配修改提交
|
2021-08-12 18:35:23 +08:00 |
ZhangBiao
|
e7ebe6527b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-12 17:38:39 +08:00 |
ZhangBiao
|
e672b2644a
|
【魂灵宝】装备界面魂灵宝信息界面修改
|
2021-08-12 17:38:24 +08:00 |
jiaoyangna
|
5c4696ad6c
|
太初秘卷修改提交
|
2021-08-12 17:32:34 +08:00 |
ZhangBiao
|
a0ef88e58d
|
Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
# Conflicts:
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2021-08-12 14:56:26 +08:00 |
jiaoyangna
|
027f2a3d86
|
十绝阵修改提交
|
2021-08-12 14:40:12 +08:00 |
jiaoyangna
|
a5af78f2c9
|
主城界面修改
|
2021-08-12 12:00:36 +08:00 |
ZhangBiao
|
bbe2bb6d6d
|
【寻宝迷踪】提交
|
2021-08-12 12:00:18 +08:00 |
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 |
ZhangBiao
|
e19dda12e7
|
Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
|
2021-08-11 15:46:13 +08:00 |
jiaoyangna
|
c3d45f1316
|
【ID1010059】
【新功能】太初密卷
|
2021-08-11 15:15:41 +08:00 |
gaoxin
|
a6899e297e
|
【log】这个log会导致IOS切换账号卡死...什么鬼
|
2021-08-11 10:53:44 +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 |
jiaoyangna
|
e26a8a698c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-06 15:47:37 +08:00 |
jiaoyangna
|
34357fddff
|
滑动条修改提交
|
2021-08-06 15:47:31 +08:00 |
zhangqiang
|
43609ae65d
|
山河设计图觉醒图标修正
|
2021-08-06 14:42:34 +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 |
jiaoyangna
|
5cf3388a59
|
滑动 回弹修改提交
|
2021-08-06 11:29:06 +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 |
ZhangBiao
|
87cf2102fe
|
【寻宝迷踪】添加资源
|
2021-08-04 18:16:36 +08:00 |
gaoxin
|
e46fa3636d
|
【登录视频】修复登录视频黑屏
|
2021-08-04 18:06:51 +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 |
jiaoyangna
|
488b7469f6
|
【ID1009737】
【滑动界面】可上下滑动的界面设定一个滑动上限
|
2021-08-04 15:52:30 +08:00 |
jiaoyangna
|
70ad440eb3
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-04 15:36:47 +08:00 |
jiaoyangna
|
3f9b6be120
|
【ID1009737】
【滑动界面】可上下滑动的界面设定一个滑动上限
|
2021-08-04 15:36:39 +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 |