ZhangBiao
|
ca59c47cce
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-30 15:29:35 +08:00 |
ZhangBiao
|
671f3cfb28
|
【公会推荐】重复打开工会界面名称会重复修改
|
2021-08-30 15:29:22 +08:00 |
wangzhenxing
|
172f800d2e
|
【战斗】=============杨戬新技能特效提交
|
2021-08-30 14:14:48 +08:00 |
skuld
|
1cb0353b43
|
添加log
|
2021-08-28 17:21:36 +08:00 |
jiaoyangna
|
f11e33efc1
|
添加log
|
2021-08-28 17:12:10 +08:00 |
jiaoyangna
|
dd9392871e
|
十绝阵公会名字显示错误
|
2021-08-28 17:03:22 +08:00 |
gaoxin
|
c19cfb3d49
|
【提审】关闭太初密卷显示
|
2021-08-28 15:26:35 +08:00 |
gaoxin
|
ee4a465c41
|
【角色升星】修复角色达到最大星级依然可以跳转觉醒、进阶页签的问题
|
2021-08-28 15:20:44 +08:00 |
gaoxin
|
eed381315d
|
【提审】添加石矶提审服资源
|
2021-08-28 15:04:13 +08:00 |
gaoxin
|
908ca14632
|
【shader】添加对所有平台的支持
|
2021-08-28 13:40:15 +08:00 |
wangzhenxing
|
6ef1d6c643
|
【战斗】===========被动115 DOT类Buff 清除逻辑修改
|
2021-08-27 18:02:50 +08:00 |
ZhangBiao
|
7ca7e78761
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-27 15:59:38 +08:00 |
ZhangBiao
|
12c2fd7316
|
【推荐公会】增加分页请求
|
2021-08-27 15:59:22 +08:00 |
wangzhenxing
|
58f34e049b
|
【战斗】=============被动91,160 修改提交
|
2021-08-27 15:27:53 +08:00 |
gaoxin
|
a3f9967651
|
【提审服】精卫穿秋裤,慈航穿棉袄
|
2021-08-27 15:23:03 +08:00 |
zhangqiang
|
4abca9f0a2
|
漏提
|
2021-08-27 15:15:42 +08:00 |
zhangqiang
|
50268807c3
|
【十绝阵】左上角数据刷新不及时,得重进界面才变化
|
2021-08-27 15:12:22 +08:00 |
gaoxin
|
792a72676a
|
【适龄提示】
|
2021-08-27 14:20:36 +08:00 |
zhangqiang
|
037c4a5ac8
|
【十绝阵】左上角数据刷新不及时,得重进界面才变化
|
2021-08-27 11:14:12 +08:00 |
zhangshanxue
|
c542bf612d
|
【资源】循环依赖处理
|
2021-08-26 22:29:58 +08:00 |
ZhangBiao
|
3a102c93fa
|
【觉醒】神将界面觉醒显示
|
2021-08-26 18:54:14 +08:00 |
gaoxin
|
f25148fb68
|
【资源】重名资源修改
|
2021-08-26 17:02:29 +08:00 |
gaoxin
|
c325bf563f
|
Revert 回滚错误的合并 4f19f12612
|
2021-08-26 16:43:27 +08:00 |
gaoxin
|
2f9357608a
|
【太初密卷】修改为拉伸的方式
|
2021-08-26 16:30:52 +08:00 |
zhangqiang
|
0202985814
|
【失败界面按钮位置调整】
|
2021-08-26 14:12:54 +08:00 |
zhangqiang
|
5b9542d391
|
【跨服十绝阵】请求跨服排行
|
2021-08-26 14:12:28 +08:00 |
zhangqiang
|
20554f8fd8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-26 11:49:11 +08:00 |
zhangqiang
|
17e4c209c7
|
【神将列表】排序修改-张彪
|
2021-08-26 11:48:36 +08:00 |
gaoxin
|
eebd99883b
|
【优化】添加判断物体是否被销毁的方法,优化可能导致黑屏卡死的问题
|
2021-08-25 20:59:26 +08:00 |
gaoxin
|
a6e93212d0
|
【数数】修改部分数据到进入游戏时上报
|
2021-08-25 19:38:49 +08:00 |
zhangqiang
|
b44c1a3e8f
|
【装备界面】装备界面替换魂灵宝,会生成一个假的宝物
|
2021-08-25 18:07:05 +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 |
liujiaqi
|
b82765322f
|
[战斗]=====新灼烧预设修改
|
2021-08-15 17:51:21 +08:00 |
wangzhenxing
|
3456f2b924
|
[战斗]====材质球提交
|
2021-08-25 17:11:39 +08:00 |
wangzhenxing
|
690db47d68
|
【战斗】=========复活,新灼烧特效预设提交
|
2021-08-25 14:37:10 +08:00 |
gaoxin
|
f778b03879
|
【打开网页】添加打开内置浏览器和外部浏览器的配置,解决老包无法打开网页的问题
|
2021-08-25 14:27:08 +08:00 |
zhangqiang
|
c8a06d9c5d
|
【重复名】特效重复名提交
|
2021-08-25 13:55:37 +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 |
gaoxin
|
6f108e2f5c
|
【游戏帧率】默认修改为30帧
|
2021-08-24 15:34:50 +08:00 |
ZhangBiao
|
8af3d5aa39
|
【送神祠】
|
2021-08-23 20:59:30 +08:00 |
ZhangBiao
|
6fc59dbe11
|
【太初密卷】协议提交
|
2021-08-23 20:46:50 +08:00 |
ZhangBiao
|
f0a0be43e6
|
【送神祠】灵兽分解
|
2021-08-23 19:45:53 +08:00 |
ZhangBiao
|
bd7383f063
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-23 16:47:26 +08:00 |
gaoxin
|
482d5371ee
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-23 15:48:06 +08:00 |
gaoxin
|
5c0696c7ac
|
【登录界面】修复隐私协议可以在全屏登录按钮上面的问题
|
2021-08-23 15:47:46 +08:00 |
ZhangBiao
|
87234641fa
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-23 15:45:24 +08:00 |
ZhangBiao
|
1614afb3bf
|
【排序优化】修改神将界面中的排序规则
|
2021-08-23 15:45:10 +08:00 |
jiaoyangna
|
6ea8e96e59
|
太初秘卷红点修改提交
(cherry picked from commit c69a23be4ab0f01ab2dafe00ed1d9db3574e7314)
|
2021-08-23 14:34:08 +08:00 |
jiaoyangna
|
6a36e5ffd3
|
太初秘卷红点提交
(cherry picked from commit 8d99139640ed01e9ed692d0f74f2923dac24f839)
|
2021-08-23 14:27:49 +08:00 |
jiaoyangna
|
16ca4f84d6
|
太初秘卷红点修改提交
(cherry picked from commit b11e01a2972353c71d7c90c3a6443ded59892981)
|
2021-08-23 14:27:41 +08:00 |
jiaoyangna
|
ca656636ac
|
太初秘卷红点提交
(cherry picked from commit cbdcb66b07470bbc0662f04627503a175c097c8f)
|
2021-08-23 14:09:43 +08:00 |
Zhang Biao
|
a7350e7f53
|
【修行】测试提交
|
2021-08-21 16:17:29 +08:00 |
gaoxin
|
259b43f2c6
|
【称号】修复踏碎凌霄称号IOS黑片问题
|
2021-08-20 22:40:10 +08:00 |
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 |
ZhangBiao
|
8ee8ec9dea
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-20 12:01:23 +08:00 |
ZhangBiao
|
20451e4282
|
【灵兽山升级】战力上升和属性提升对不上,斜着显示
|
2021-08-20 12:01:17 +08:00 |
zhangqiang
|
864fd20aac
|
【神将召唤引导】当正好赶上两个神将加入卡池的时候,会有弹窗,但是弹窗蒙版会挡住引导按钮
|
2021-08-20 11:44:49 +08:00 |
zhangqiang
|
6ad43f93ed
|
【飘邈之旅】玩法入口文字错误
|
2021-08-20 10:56:14 +08:00 |
gaoxin
|
f8cc4f5c73
|
【音效】治疗音效恢复
|
2021-08-19 21:02:34 +08:00 |
gaoxin
|
8f9f43adcb
|
【音效】缺失音效恢复
|
2021-08-19 20:29:43 +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 |
gaoxin
|
c1977b976c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-19 14:43:48 +08:00 |
gaoxin
|
6bcc7cf775
|
【战斗】修复部分普攻音效缺失
|
2021-08-19 14:43:43 +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
|
c08ce1ea0b
|
【ID1018087】
【适配】十绝阵1080*2550,显示不全
|
2021-08-17 17:55:43 +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
|
a3ba14fe2c
|
【寻宝迷踪】增加动态例会
|
2021-08-17 13:35:03 +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 |
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 |