Commit Graph

7914 Commits (3f24f4cd86cc3ed3e54d292fbc3556de7f5478c9)

Author SHA1 Message Date
liujiaqi e9bb0163de 【资源】杨戬施法特效 2021-09-02 10:42:28 +08:00
ZhangBiao 00bd84f77c 【升星有礼】增加新将例会 2021-09-02 09:57:17 +08:00
jiaoyangna 3ef0ad39b6 【ID1010167】
【乾坤宝盒】许愿魂印弹窗中,魂印图标下方添加道具名称
2021-09-01 20:06:09 +08:00
jiaoyangna 615aaa0d88 【ID1010167】
【乾坤宝盒】许愿魂印弹窗中,魂印图标下方添加道具名称
2021-09-01 19:59:37 +08:00
jiaoyangna 5b8001ce28 【ID1018329】
【宝物分解】背包界面分解宝物,分解后返回,依然弹出已被分解的宝物

(cherry picked from commit 41831fad79)
2021-09-01 19:36:19 +08:00
jiaoyangna 41831fad79 【ID1018329】
【宝物分解】背包界面分解宝物,分解后返回,依然弹出已被分解的宝物
2021-09-01 19:35:28 +08:00
jiaoyangna 9ab223d577 【ID1010233】
【宝物详情优化】在装备界面和情报界面增加宝物共鸣属性显示
2021-09-01 19:20:34 +08:00
wangzhenxing 3e36a537b3 [战斗]======= 目标选择逻辑 生命百分比最低 不选有不灭的 显示层:死亡后怒气显示不清空 被动99 307 目标选择修改 2021-09-01 18:40:32 +08:00
jiaoyangna 75fc33c18b 回放资源修改提交 2021-09-01 18:17:14 +08:00
jiaoyangna f49deb2471 回放修改提交 2021-09-01 18:13:58 +08:00
jiaoyangna ae71f6941d 四灵修改提交 2021-09-01 18:10:51 +08:00
jiaoyangna 3b8fc3700f 排行榜修改提交 2021-09-01 17:21:33 +08:00
jiaoyangna f516731201 一键上阵修改提交 2021-09-01 17:12:25 +08:00
jiaoyangna bfe127012e 排行榜修改提交 2021-09-01 16:39:09 +08:00
jiaoyangna 19be216616 升级修改提交 2021-09-01 16:25:58 +08:00
jiaoyangna 3373e3daf4 升级修改提交 2021-09-01 16:07:33 +08:00
jiaoyangna 0f3e76e00f 层级修改 2021-09-01 14:52:13 +08:00
jiaoyangna 3372e2a965 已激活属性之间的空隙过大 2021-09-01 14:49:58 +08:00
jiaoyangna 4f266a20b9 红点问题修改提交 2021-09-01 14:17:21 +08:00
jiaoyangna 13e7935d1d 下方显示替换红点,点击一键装备无法替换 2021-09-01 12:47:30 +08:00
jiaoyangna 1744845cba 建木神树转移到修行 2021-09-01 11:57:15 +08:00
jiaoyangna 0654020f6a 建木神树快速升级 2021-09-01 11:49:22 +08:00
jiaoyangna 1245d7635d 四灵修改 2021-09-01 11:02:07 +08:00
jiaoyangna 49a4b32138 四灵第二次修改 2021-09-01 10:43:57 +08:00
jiaoyangna a12c9330c7 四灵第二次修改提交 2021-09-01 10:08:25 +08:00
jiaoyangna 56af6f1a11 第一次bug修改提交 2021-08-31 20:22:59 +08:00
jiaoyangna ad9e76bda5 四灵试炼修改提交 2021-08-31 19:03:29 +08:00
gaoxin dec3a4d338 【资源】织女新立绘添加 2021-08-31 18:34:16 +08:00
jiaoyangna d9bef4f49a 战力修改提交 2021-08-31 18:08:57 +08:00
jiaoyangna 207a4eb512 战力修改提交 2021-08-31 18:07:34 +08:00
jiaoyangna f712786650 排行榜宝物数据修改 2021-08-31 17:50:58 +08:00
jiaoyangna 82b992c4ca 我的助战报错修改提交 2021-08-31 17:12:30 +08:00
jiaoyangna d660fe362e 装备宝物界面修改提交 2021-08-31 17:06:01 +08:00
jiaoyangna ac22bd000b 装备宝物界面修改提交 2021-08-31 17:02:22 +08:00
gaoxin 1c7d7427e4 【战斗】被动添加时Log 2021-08-31 15:22:02 +08:00
wangzhenxing 2211be3b61 [战斗]=============被动263 269 274 332 112 145 修改提交 2021-08-31 15:21:55 +08:00
gaoxin 9eb136df40 【战斗】添加一些战斗日志 2021-08-31 15:21:27 +08:00
gaoxin 7ef231e7a8 【战斗】修复战斗报错 2021-08-31 15:21:22 +08:00
jiaoyangna dd93f737ff 排行榜上好友宝器修改 2021-08-31 15:05:17 +08:00
gaoxin 8a0b1c80a2 【战斗】被动添加时Log 2021-08-31 14:48:44 +08:00
jiaoyangna d7d8a6071b 特希奥层级修改提交 2021-08-31 14:41:35 +08:00
gaoxin 4e8e552ca8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-31 14:29:46 +08:00
wangzhenxing 7eeebb014e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-31 14:26:02 +08:00
wangzhenxing 8c6c57d916 [战斗]=============被动263 269 274 332 112 145 修改提交 2021-08-31 14:25:43 +08:00
gaoxin 93413b3b07 【战斗】添加一些战斗日志 2021-08-31 14:25:29 +08:00
jiaoyangna 72931e8ad6 失败返回报错修改 2021-08-31 13:59:03 +08:00
gaoxin c67c9fb93b 【战斗】修复战斗报错 2021-08-31 13:44:13 +08:00
jiaoyangna 13f74e0185 Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-08-31 11:39:16 +08:00
jiaoyangna 7713a65826 排行榜宝器修改 2021-08-31 11:08:12 +08:00
jiaoyangna ba96d80208 四元阵特效修改提交
(cherry picked from commit 03b00d7762)
2021-08-31 10:54:39 +08:00
jiaoyangna 209bd7ed0c 四元阵特效修改提交
(cherry picked from commit f355940615)
2021-08-31 10:54:32 +08:00
jiaoyangna 03b00d7762 四元阵特效修改提交 2021-08-31 10:52:58 +08:00
jiaoyangna f355940615 四元阵特效修改提交 2021-08-31 10:52:02 +08:00
jiaoyangna 0027722366 四灵修改提交 2021-08-30 20:07:20 +08:00
ZhangBiao 4e9ce855f2 【玩家神将信息界面】魂印本身战力不增加修改 2021-08-30 18:45:21 +08:00
ZhangBiao 6dca507aaf 【推荐工会】 2021-08-30 18:14:13 +08:00
ZhangBiao 911c1849b2 【工会推荐】搜索修改 2021-08-30 18:14:07 +08:00
ZhangBiao ec638f7c7a 【公会推荐】重复打开工会界面名称会重复修改 2021-08-30 18:14:03 +08:00
jiaoyangna 4801852d88 神应修改提交 2021-08-30 18:09:06 +08:00
jiaoyangna 1ea100ed83 神将情报界面装备宝物修改提交 2021-08-30 16:44:26 +08:00
ZhangBiao 1f2a21a587 【推荐工会】 2021-08-30 16:24:30 +08:00
ZhangBiao f484e60f87 【工会推荐】搜索修改 2021-08-30 15:37:10 +08:00
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
jiaoyangna 7756dd8292 数据资源提交 2021-08-30 14:22:15 +08:00
jiaoyangna a76f27ecf0 四灵提交 2021-08-30 14:21:41 +08:00
wangzhenxing 172f800d2e 【战斗】=============杨戬新技能特效提交 2021-08-30 14:14:48 +08:00
zhangshanxue 09fba90ce1 Merge commit 'dd9392871e43553845788df3666c8e264ada663d' into china/test 2021-08-28 19:10:42 +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
zhangshanxue 2e786a967e Merge branch 'china/dev' into china/test 2021-08-28 15:42:36 +08:00
gaoxin c19cfb3d49 【提审】关闭太初密卷显示 2021-08-28 15:26:35 +08:00
zhangshanxue fe15c46f87 Merge remote-tracking branch 'origin/china/dev' into china/test 2021-08-28 15:21:19 +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
jiaoyangna 2fbe372c76 四灵修改提交 2021-08-27 18:39:45 +08:00
zhangshanxue 51d59cd8ef Merge branch 'china/dev' into china/test 2021-08-27 18:24:42 +08:00
wangzhenxing 6ef1d6c643 【战斗】===========被动115 DOT类Buff 清除逻辑修改 2021-08-27 18:02:50 +08:00
zhangshanxue ab15ece104 Merge branch 'china/dev' into china/test
# Conflicts:
#	Assets/ManagedResources/Atlas/LoginAtlas/agetip.png.meta
#	Assets/ManagedResources/Spine/c_0038_02.meta
#	Assets/ManagedResources/Spine/c_0038_02/c_0038_02.atlas.txt.meta
#	Assets/ManagedResources/Spine/c_0038_02/c_0038_02.png.meta
#	Assets/ManagedResources/Spine/c_0038_02/c_0038_02.skel.bytes.meta
#	Assets/ManagedResources/Spine/c_0038_02/c_0038_02_Material.mat
#	Assets/ManagedResources/Spine/c_0043_02.meta
#	Assets/ManagedResources/Spine/c_0043_02/c_0043_02.atlas.txt.meta
#	Assets/ManagedResources/Spine/c_0043_02/c_0043_02.skel.bytes.meta
#	Assets/ManagedResources/Spine/c_0043_02/c_0043_02_Material.mat
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-08-27 16:42:18 +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
zhangshanxue 78c3cd8adf 【资源】循环依赖处理 2021-08-26 20:25:22 +08:00
ZhangBiao 868939fa06 【觉醒】神将界面觉醒显示 2021-08-26 18:55:42 +08:00
ZhangBiao 3a102c93fa 【觉醒】神将界面觉醒显示 2021-08-26 18:54:14 +08:00
jiaoyangna ab1a4ea627 Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-08-26 17:42:25 +08:00
jiaoyangna cd594275e0 四灵试炼修改提交 2021-08-26 17:25:02 +08:00
gaoxin be3afeb82a 【资源】重名资源修改 2021-08-26 17:02:42 +08:00
gaoxin f25148fb68 【资源】重名资源修改 2021-08-26 17:02:29 +08:00
gaoxin ea4599e860 Revert 回滚错误的合并 4f19f12612 2021-08-26 16:46:41 +08:00
gaoxin 68ac132040 【太初密卷】修改为拉伸的方式 2021-08-26 16:46:36 +08:00
zhangqiang 8cf472017b 【失败界面按钮位置调整】 2021-08-26 16:46:26 +08:00
gaoxin c325bf563f Revert 回滚错误的合并 4f19f12612 2021-08-26 16:43:27 +08:00
gaoxin 2f9357608a 【太初密卷】修改为拉伸的方式 2021-08-26 16:30:52 +08:00
zhangshanxue 8d05854eb0 Merge commit '20554f8fd82082607fa75e9c89606a576faa6669' into china/test 2021-08-26 16:19:34 +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 dd45768117 【优化】添加判断物体是否被销毁的方法,优化可能导致黑屏卡死的问题 2021-08-25 21:02:11 +08:00
gaoxin 0193d9a22e 【数数】修改部分数据到进入游戏时上报 2021-08-25 21:01:50 +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 7fc6ee71f0 【打开网页】添加打开内置浏览器和外部浏览器的配置,解决老包无法打开网页的问题 2021-08-25 14:34:47 +08:00
zhangqiang 8c46f74e45 【跨服十绝阵】 回退特殊处理 2021-08-25 14:34:42 +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 158d663639 【太初密卷】喜扑和动游渠道关闭 2021-08-25 07:32:07 +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 8500ce94ff 【游戏帧率】默认修改为30帧 2021-08-24 15:35:29 +08:00
gaoxin 6f108e2f5c 【游戏帧率】默认修改为30帧 2021-08-24 15:34:50 +08:00
jiaoyangna ae15e4899a 协议提交 2021-08-24 14:34:24 +08:00
ZhangBiao 6790df5983 【送神祠】 2021-08-23 21:30:12 +08:00
ZhangBiao f128822dbb 【送神祠】灵兽分解 2021-08-23 21:23:20 +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
gaoxin cb41480d39 【登录界面】修复隐私协议可以在全屏登录按钮上面的问题 2021-08-23 19:39:30 +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 93f96a52f5 太初秘卷红点修改提交
(cherry picked from commit c69a23be4ab0f01ab2dafe00ed1d9db3574e7314)
(cherry picked from commit 6ea8e96e59)
2021-08-23 14:39:33 +08:00
jiaoyangna 6323fed117 太初秘卷红点提交
(cherry picked from commit 8d99139640ed01e9ed692d0f74f2923dac24f839)
(cherry picked from commit 6a36e5ffd3)
2021-08-23 14:39:26 +08:00
jiaoyangna e79988c7e0 太初秘卷红点修改提交
(cherry picked from commit b11e01a2972353c71d7c90c3a6443ded59892981)
(cherry picked from commit 16ca4f84d6)
2021-08-23 14:39:19 +08:00
jiaoyangna c0a2a04db9 太初秘卷红点提交
(cherry picked from commit cbdcb66b07470bbc0662f04627503a175c097c8f)
2021-08-23 14:38:34 +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
zhangshanxue 2dccecd185 Merge branch 'china/dev' into china/test
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
2021-08-21 14:45:17 +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
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
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 29c9ed6074 【魂灵宝】装备界面调整 2021-08-13 09:52:20 +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 e3e0ef6ead 【寻宝迷踪】res提交 2021-08-12 14:56: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
ZhangBiao bbe2bb6d6d 【寻宝迷踪】提交 2021-08-12 12:00:18 +08:00
jiaoyangna eaf6c12cf9 主城预设修改 2021-08-12 11:45:31 +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 12f9a10ec8 【灵兽山升级】战力上升和属性提升对不上,斜着显示 2021-08-11 16:30:04 +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 195006e5aa 【适配】1080*2550鸿蒙阵卸下神将遮罩没铺满 2021-08-10 15:24:01 +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
jiaoyangna d0d4d68b77 冲突预设修改提交 2021-08-10 14:48:20 +08:00
ZhangBiao d7aa6d66f9 【无尽副本】特效穿透提交 2021-08-09 17:35:22 +08:00
ZhangBiao d10879ae57 【寻宝迷踪】res提交 2021-08-09 17:12:12 +08:00
ZhangBiao ed0f5296d1 【寻宝迷踪】提交 2021-08-09 17:11:30 +08:00
jiaoyangna 8fdd7eb8a9 牛气冲天跳转返回之后页签跳到第一个修改 2021-08-09 16:58:06 +08:00
gaoxin a1d1cff969 【登录】维护状态提示文字修改 2021-08-09 16:53:27 +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 ee3338ee75 【服务器】服务器选择界面每次打开时都重新获取一遍服务器列表数据 2021-08-09 16:34:25 +08:00
jiaoyangna fe7fa52879 牛气冲天跳转神将抽卡 2021-08-09 16:34:20 +08:00
jiaoyangna 7e3bd8623a 牛气冲天跳转点将台修改提交 2021-08-09 16:34:16 +08:00
gaoxin 95431c2f9b 【服务器】选择服务器时维护状态提示文字修改 2021-08-09 16:34:11 +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