gaoxin
|
2f9357608a
|
【太初密卷】修改为拉伸的方式
|
2021-08-26 16:30:52 +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
|
0c7e38a715
|
Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
|
2021-08-25 15:25:54 +08:00 |
jiaoyangna
|
404a30a57d
|
四灵修改提交
|
2021-08-25 15:15:50 +08:00 |
wangzhenxing
|
690db47d68
|
【战斗】=========复活,新灼烧特效预设提交
|
2021-08-25 14:37:10 +08:00 |
gaoxin
|
f778b03879
|
【打开网页】添加打开内置浏览器和外部浏览器的配置,解决老包无法打开网页的问题
|
2021-08-25 14:27:08 +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
|
8af3d5aa39
|
【送神祠】
|
2021-08-23 20:59:30 +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 |
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 |
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 |
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 |
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 |
jiaoyangna
|
76dbc01270
|
Merge branch 'china/dev' into 0功能/silingshilian
|
2021-08-12 15:54:58 +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 |
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 |