Commit Graph

7522 Commits (60b842e2abe642adc42645fefda225e69752bb12)

Author SHA1 Message Date
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
gaoxin 5594474379 【累充】白片恢复 2021-07-29 18:05:44 +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 529f8e3bd2 【协议提交】 2021-07-29 16:45:06 +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 becf23c1af Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-29 16:35:25 +08:00
jiaoyangna 283f9d209a 魂印圈圈错误修改 2021-07-29 16:35:20 +08:00
wangzhenxing 8c1130e89f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-29 16:20:02 +08:00
wangzhenxing 126eba3f26 [称号]==========罗浮争锋三个称号特效预设修改 2021-07-29 16:19:48 +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 44119d5a28 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-29 15:21:48 +08:00
jiaoyangna 01632378f6 魂印分解界面修改 2021-07-29 15:21:44 +08:00
ZhangBiao c6598ecff4 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-29 15:03:54 +08:00
ZhangBiao 49d4336f38 【限时召唤优化】调整适配,使部分屏幕内隐藏的召唤次数上限显示出来 2021-07-29 15:03:39 +08:00
jiaoyangna 856f03b494 【ID1017815】
【魂印分解】一键选择,优先选择了品质高的魂印
2021-07-29 15:01:58 +08:00
jiaoyangna 1cff130e45 【ID1017827】
【心魔试炼】dev分支心魔试炼界面底部白边
2021-07-29 14:38:13 +08:00
jiaoyangna 548e43b486 共鸣中去掉一键装备红点 2021-07-29 14:33:52 +08:00
jiaoyangna 2f47e10caf 重置提交 2021-07-29 14:20:51 +08:00
jiaoyangna 9a87435469 【ID1017808】
【天书秘卷】适配错误,文字超出显示区域
2021-07-29 14:16:07 +08:00
jiaoyangna 8ad1911755 文字大小调整 2021-07-29 13:55:50 +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
jiaoyangna f50caf3ff5 清理空文件夹 2021-07-29 11:28:30 +08:00
jiaoyangna 43c4c159ed Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-29 11:27:42 +08:00
jiaoyangna dd076dfb6a 立绘删除 2021-07-29 11:25:36 +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 2a31ef09ce Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-29 11:11:43 +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
ZhangBiao e1ae3e3bf3 【副本界面】按下区域大小调整 2021-07-29 10:09:02 +08:00
jiaoyangna 78c982e740 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-28 18:39:16 +08:00
jiaoyangna bac3e3dfa9 动画提交 2021-07-28 18:39:05 +08:00
zhangqiang cc8974c016 【跨服切磋】 2021-07-28 18:38:06 +08:00
jiaoyangna f4cc4d7df6 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-28 17:46:11 +08:00
jiaoyangna 7ee1ef9910 Merge branch 'china/dev-c' into china/dev
# Conflicts:
#	Assets/ManagedResources/Atlas/DyAct_Activity5.meta
#	Assets/ManagedResources/EffectResUI/ChengHao_new.meta
#	Assets/ManagedResources/EffectResUI/ChengHao_new/Animation.meta
#	Assets/ManagedResources/EffectResUI/ZhenQiBaoGe/Texture.meta
#	Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
2021-07-28 17:45:59 +08:00
gaoxin e552db5499 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-28 17:43:04 +08:00
gaoxin ef78e0ae21 【跨服聊天】添加跨服聊天频道 2021-07-28 17:42:58 +08:00
jiaoyangna b98fd71d35 删除资源工具提交 2021-07-28 17:00:14 +08:00
jiaoyangna 55c839dcd0 Revert "Revert "红点修改提交""
This reverts commit d53776b558.
2021-07-28 16:59:07 +08:00
jiaoyangna 8c01285354 Revert "Revert "强化和精炼界面修改""
This reverts commit 4c9871767f.
2021-07-28 16:59:00 +08:00
jiaoyangna 7ac8f03cd3 Revert "Revert "宝物培养修改提交""
This reverts commit 4590076eb9.
2021-07-28 16:58:52 +08:00
jiaoyangna ab7c586a90 Revert "Revert "装备界面改动""
This reverts commit 9a1d361c63.
2021-07-28 16:58:44 +08:00
jiaoyangna 93a9473184 红点修改提交 2021-07-28 16:52:41 +08:00
ZhangBiao 33edb62796 【锻器阁】增加魂印合成引导 2021-07-28 16:45:29 +08:00
wangzhenxing 68e3a32140 [bug]====称号层级修改 2021-07-28 16:41:37 +08:00
wangzhenxing ef714577e8 [bug]========称号显示修改 2021-07-28 16:10:58 +08:00
zhangqiang 9a2d9c70a7 【新功能】罗浮争锋排行榜增加跨服切磋功能 2021-07-28 15:48:35 +08:00
jiaoyangna ad850da05f 宝物共鸣修改 2021-07-28 15:40:50 +08:00
ZhangBiao 263cb18d03 【车迟斗法】玩法内等待次数刷新,红点不显示,退出重进显示正常 修复 2021-07-28 15:16:10 +08:00
jiaoyangna 4805b041e8 宝物使用跳转错误修改 2021-07-28 15:07:57 +08:00
ZhangBiao 87e8496df0 【适配】优化神将升星提示在长屏手机的适配效果 2021-07-28 14:49:21 +08:00
jiaoyangna ab9e5f8e64 红点修改提交 2021-07-28 14:00:17 +08:00
jiaoyangna eea24f126e 红点添加 2021-07-28 13:49:04 +08:00
ZhangBiao 2c0c23553c 【逍遥游】恭喜获得中道具有跳转按钮,跳转后再返回显示空的恭喜获得 2021-07-28 12:06:58 +08:00
jiaoyangna 1123d9dc2d 宝物修改提交 2021-07-28 11:52:47 +08:00
ZhangBiao 48330717a7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-28 11:20:36 +08:00
ZhangBiao ffd0685d97 【任务跳转】未解锁灵兽山,灵兽招募任务前往提示活动未开启,应提示功能未解锁
【红点】车迟斗法的红点仍绑在副本入口处,而非公会按钮
2021-07-28 11:20:27 +08:00
liujiaqi dab4dc03fb 【资源】误删资源回滚 2021-07-28 11:10:14 +08:00
jiaoyangna b0c50a4571 id1017799
(cherry picked from commit 35a048adc9)
2021-07-28 11:07:16 +08:00
jiaoyangna 35a048adc9 id1017799 2021-07-28 11:06:33 +08:00
zhangqiang 0204573ad9 【玩家信息】跨服排行榜里,查看玩家信息,战力显示超框问题 2021-07-28 10:52:49 +08:00
jiaoyangna 527295f30c 宝物优化 2021-07-28 10:51:39 +08:00
zhangqiang e54a17decb 【魂印穿戴】点击魂印不穿戴,魂印在列表中消失 2021-07-28 10:51:35 +08:00
ZhangBiao c8d35b5458 【星魂福袋】点击使用数量加号,提示英雄达上限 修复 2021-07-28 09:58:41 +08:00
jiaoyangna 88df4dbde8 为装备的宝物点击报错修改提交 2021-07-28 09:48:08 +08:00
jiaoyangna d1845618d1 宝物可强化时,TIPS上的【强化】按钮未显示红点,精炼功能有相同问题 2021-07-27 18:53:36 +08:00
jiaoyangna 94c92a7f22 拥有可替换/战斗力较高的宝物时,应在宝物图标右上角,及下方的魂宝/灵宝按钮上显示红点,不应当在魂宝/灵宝装备格子上显示红点 2021-07-27 18:34:37 +08:00
jiaoyangna b75d869c8a 【资源优化】整理废弃的冗余资源,减少包体大小 2021-07-27 17:13:18 +08:00
jiaoyangna 9a4c92baa1 Revert "【ID1009762】"
This reverts commit c99394b54e.
2021-07-27 17:04:12 +08:00
jiaoyangna 5fc9cc77a2 Revert "【ID1009762】"
This reverts commit 99d668ae30.
2021-07-27 17:03:52 +08:00
jiaoyangna 99d668ae30 【ID1009762】
【资源优化】整理废弃的冗余资源,减少包体大小
2021-07-27 16:19:11 +08:00
jiaoyangna c99394b54e 【ID1009762】
【资源优化】整理废弃的冗余资源,减少包体大小
2021-07-27 15:24:11 +08:00
jiaoyangna d4126bb634 宝物培养修改 2021-07-27 14:39:48 +08:00
zhangqiang 042644bdcb 【资源】冲突处理 2021-07-27 13:53:37 +08:00
jiaoyangna 7225723b34 引导修改提交 2021-07-27 10:25:42 +08:00
gaoxin d4e78afcab 【packID】数数打点新增字段 2021-07-27 10:04:22 +08:00
ZhangBiao 509f34e19b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-26 19:00:55 +08:00
ZhangBiao 74c713c65b 【主题活动】加强限时商市,珍奇宝阁入口按钮的辨识度 2021-07-26 19:00:41 +08:00
ZhangBiao 8e5664f85c bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/26,17:54:54 2021-07-26 17:54:55 +08:00
jiaoyangna 917662ff20 宝物培养红点提交 2021-07-26 17:16:29 +08:00
jiaoyangna efc0f62cc5 【ID1017708】
【无尽副本】购买秘宝后等待下一期秘宝刷新,上一期购买秘宝获得的积分不清,导致下期秘宝无法正常领取奖励

(cherry picked from commit 76fad397de)
2021-07-26 16:06:21 +08:00
jiaoyangna 825c38fc0d 红点修改提交
(cherry picked from commit c546710d1f)
2021-07-26 15:19:57 +08:00
jiaoyangna c546710d1f 红点修改提交 2021-07-26 15:18:49 +08:00
ZhangBiao 07de90eb45 【提交】 2021-07-26 15:07:49 +08:00
ZhangBiao da34a5834b 【主题活动】时间显示调整 2021-07-26 14:36:58 +08:00
ZhangBiao 1ba38242ad 【主题活动】提交 2021-07-26 12:29:13 +08:00
liujiaqi 82677ad40c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-26 12:02:32 +08:00
zhangqiang b54f3ca07a 【跨服天梯】主界面 2021-07-27 11:34:46 +08:00
zhangqiang 71f7e8a469 Merge branch 'china/dev' into china/jumpserver
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
2021-07-27 11:26:30 +08:00
gaoxin 34b7a00d47 【特效】重名资源处理 2021-07-27 10:19:33 +08:00
gaoxin 3e11938166 【meta】 2021-07-27 10:06:56 +08:00
liujiaqi 6ae640d65a bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/26,12:00:55 2021-07-26 12:01:02 +08:00
jiaoyangna 76fad397de 【ID1017708】
【无尽副本】购买秘宝后等待下一期秘宝刷新,上一期购买秘宝获得的积分不清,导致下期秘宝无法正常领取奖励
2021-07-26 11:23:26 +08:00
JieLing d2090cb930 【跨服】修复角色信息英雄详细信息报错 2021-07-26 11:10:11 +08:00
ZhangBiao 11543e53a0 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-26 11:09:20 +08:00
ZhangBiao beea770b78 【竞技场】适配调整 2021-07-26 11:09:07 +08:00
zhangqiang e01694fa28 【跨服天梯】战斗记录协议修改 2021-07-26 11:03:45 +08:00
jiaoyangna 9a1d361c63 Revert "装备界面改动"
This reverts commit c131d41d58.
2021-07-26 10:03:10 +08:00
jiaoyangna 4590076eb9 Revert "宝物培养修改提交"
This reverts commit bcd0651029.
2021-07-26 10:00:59 +08:00
jiaoyangna 4c9871767f Revert "强化和精炼界面修改"
This reverts commit 9d78af51e0.
2021-07-26 10:00:49 +08:00
jiaoyangna d53776b558 Revert "红点修改提交"
This reverts commit 734efe7b52.
2021-07-26 10:00:07 +08:00
jiaoyangna c93f98dabc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-26 09:55:42 +08:00
ZhangBiao 1634345c1e 【清除log】 2021-07-26 09:48:18 +08:00
jiaoyangna b49166afe1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-24 19:39:25 +08:00
jiaoyangna 734efe7b52 红点修改提交 2021-07-24 19:36:34 +08:00
ZhangBiao 7111f53936 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-24 19:34:13 +08:00
ZhangBiao 7e9fad28b7 【万象商会】提交 2021-07-24 19:33:56 +08:00
jiaoyangna 06dfb74d33 活动修改提交 2021-07-24 19:33:54 +08:00
jiaoyangna 7a9100dfec Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-24 19:08:06 +08:00
jiaoyangna e5d387c37d 主题活动任务修改提交 2021-07-24 19:07:56 +08:00
ZhangBiao 4c73ac0976 【万象商会】刷新 2021-07-24 18:59:42 +08:00
jiaoyangna 7b9a5e535c 红点检测修改提交 2021-07-24 18:16:05 +08:00
jiaoyangna 8d76903f10 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-24 18:13:45 +08:00
jiaoyangna 8226901eb8 任务修改提交 2021-07-24 18:13:40 +08:00
ZhangBiao 5bba13ccc0 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-24 17:46:03 +08:00
ZhangBiao 9a7ef2f0a2 【轩辕宝境】从任意一个宝境里返回轩辕宝境主界面,顶部资源条消失 2021-07-24 17:45:48 +08:00
jiaoyangna 1e70bdb2ca 活动修改提交 2021-07-24 17:38:48 +08:00
ZhangBiao ccc208b2c4 【万象商会】界面关闭 2021-07-24 17:02:30 +08:00
ZhangBiao c045a944ee Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-24 16:30:34 +08:00
ZhangBiao b910dcfc6f 【主题活动商店】增加商店类型 2021-07-24 16:30:19 +08:00
jiaoyangna 9d78af51e0 强化和精炼界面修改 2021-07-24 16:22:16 +08:00
jiaoyangna 24363d5c03 【ID1009862】
15日登录送白泽活动加入预告功能
2021-07-24 15:46:00 +08:00
jiaoyangna 6c59983568 工会查看信息报错修改 2021-07-24 15:18:38 +08:00
ZhangBiao 7bc3a3d460 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-23 19:23:05 +08:00
ZhangBiao c3a5e5b7de 【主题活动】bannerSetNative 2021-07-23 19:22:56 +08:00
jiaoyangna fd7d51168d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-23 19:12:46 +08:00
jiaoyangna bcd0651029 宝物培养修改提交 2021-07-23 19:12:42 +08:00
ZhangBiao 38bbb808b4 【主题活动】商店 2021-07-23 19:05:53 +08:00
wangzhenxing ff6639ebfb 【称号】=====称号属性显示修改 2021-07-23 18:34:07 +08:00
ZhangBiao d571e3126d bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/23,18:33:47 2021-07-23 18:33:47 +08:00
ZhangBiao 25ace8439d 【公会】旗帜位置调整 2021-07-23 18:26:28 +08:00
wangzhenxing 20bf67d50e 【称号】====称号特效显示修改,称号特效预设修改 2021-07-23 18:23:55 +08:00
zhangqiang 3d13fbca6d 【拍脸修改】回退 2021-07-23 17:51:22 +08:00
ZhangBiao 8a90b87942 【新副本界面】心魔次数文字错误修改,和弹窗修改 2021-07-23 17:43:30 +08:00
ZhangBiao 627954ae3f 【大闹天宫】层数错误提交 2021-07-23 17:26:24 +08:00
ZhangBiao 2dc965137b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-23 17:15:15 +08:00
ZhangBiao 93469872a7 【主题活动】提交 2021-07-23 17:15:04 +08:00
zhangqiang beb91b9407 【拍脸报错】 2021-07-23 16:43:51 +08:00
wangzhenxing 3dc2970f1f [功能]============15日登陆预告预设修改,整点自动刷新 2021-07-23 16:27:33 +08:00
ZhangBiao d114a6404a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-23 15:56:00 +08:00
ZhangBiao bd5b473246 【大闹天宫】增加层数显示 2021-07-23 15:55:49 +08:00
zhangqiang 3b15f14d97 【跨服天梯】世界等级 2021-07-23 15:54:39 +08:00
wangzhenxing 887f071868 [功能]============15日登陆预告预设提交 2021-07-23 15:30:40 +08:00
zhangqiang 545e6cd8af 【跨服天梯】世界等级提交 2021-07-23 15:28:15 +08:00
ZhangBiao 31e8aa5d00 【山河社稷图】关闭关卡界面入口 2021-07-23 15:22:51 +08:00
ZhangBiao 3eee03aca7 【新副本界面】等级提示错误修复 2021-07-23 14:55:33 +08:00
wangzhenxing 79a1a5acc0 [功能]============称号显示修改 2021-07-23 14:15:53 +08:00
ZhangBiao dc4fbe89e5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-23 14:11:50 +08:00
ZhangBiao b5fd7ba8f6 【新副本界面】刷新时间和引导修改 2021-07-23 14:11:29 +08:00
jiaoyangna 92738c45a7 超值基金红点修改 2021-07-23 13:48:07 +08:00
jiaoyangna ffeacc6bf0 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-23 13:45:43 +08:00
jiaoyangna 4af32b0a85 超值基金红点修改提交 2021-07-23 13:45:40 +08:00
zhangqiang 731715ed35 【功能引导】幸运探宝开启,界面不会自动切换到幸运探宝入口 2021-07-23 13:43:34 +08:00
DESKTOP-98AVA47\Administrator ce89a20050 活动时间修改 2021-07-23 11:47:15 +08:00
DESKTOP-98AVA47\Administrator 7703a9e740 红点修改提交 2021-07-23 11:45:13 +08:00
DESKTOP-98AVA47\Administrator 022681face 红点修改提交 2021-07-23 11:36:44 +08:00
ZhangBiao 2164685f0c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-23 11:27:38 +08:00
ZhangBiao 8981c707ba 【主题活动】分页提交 2021-07-23 11:27:28 +08:00
wangzhenxing 02cea65055 [称号]====跨服称号资源提交 2021-07-23 11:20:05 +08:00
DESKTOP-98AVA47\Administrator 6986b0d3a1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-23 11:17:53 +08:00
DESKTOP-98AVA47\Administrator 6f8cb042bb 报错修改提交 2021-07-23 11:17:50 +08:00
wangzhenxing d0d533cecc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-23 11:08:03 +08:00
wangzhenxing f7029c2ef0 [功能]==============15日登陆添加 预告 2021-07-23 11:07:46 +08:00
zhangqiang 350f13371a 【逍遥游】掉落问题修改 2021-07-23 10:58:13 +08:00
ZhangBiao 3d105fae48 bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/23,10:36:13 2021-07-23 10:36:13 +08:00
ZhangBiao 7f53ab4371 bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/23,10:35:43 2021-07-23 10:35:43 +08:00
ZhangBiao 133bce077e bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/23,10:35:05 2021-07-23 10:35:06 +08:00
ZhangBiao 4ebfef77f6 bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/23,10:34:30 2021-07-23 10:34:31 +08:00
DESKTOP-98AVA47\Administrator 821f012981 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-22 20:25:35 +08:00
DESKTOP-98AVA47\Administrator 01f9ec621d 【ID1009871】
【点将台】调整神将召唤、友情召唤和普通召唤的顺序
2021-07-22 20:25:32 +08:00
gaoxin 6461dbc161 【灵兽特惠】修复全面屏时间显示位置错误 2021-07-22 20:16:30 +08:00
DESKTOP-98AVA47\Administrator ede748149f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-22 20:03:14 +08:00
DESKTOP-98AVA47\Administrator 875325fabb 【ID1009871】
【点将台】调整神将召唤、友情召唤和普通召唤的顺序
2021-07-22 20:03:03 +08:00
ZhangBiao ac3178d7f6 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-22 19:55:37 +08:00
DESKTOP-98AVA47\Administrator 25aed04450 报错修改 2021-07-22 19:55:19 +08:00
ZhangBiao 79aab3d3b4 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-22 19:53:39 +08:00
ZhangBiao a33be944cc 【万象商会】提交 2021-07-22 19:53:25 +08:00
DESKTOP-98AVA47\Administrator f676618e42 【ID1009871】
【点将台】调整神将召唤、友情召唤和普通召唤的顺序
2021-07-22 19:50:38 +08:00
gaoxin 0db39ccbe3 Merge branch 'china/ios' into china/dev
# Conflicts:
#	Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/CarbonImg_monster 4.png.meta
2021-07-22 19:39:14 +08:00
gaoxin a16d134d2d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-22 19:37:13 +08:00
gaoxin a228c18c50 【MapPlayerView】随机使用lua原生的方法 2021-07-22 19:36:17 +08:00
gaoxin 9d7a51fd57 【容错】登录容错添加,服务器发送不存在的活动时,不再卡死 2021-07-22 19:35:22 +08:00
zhangqiang c3b68ef28a 【跨服】修改跨服排行未解锁提示文字 2021-07-22 19:30:53 +08:00
zhangqiang 1cf142c82b 【跨服天梯】国内提交+1 2021-07-22 19:01:46 +08:00
ZhangBiao 1e822443f9 Merge branch '0优化/副本界面' into china/dev 2021-07-22 18:19:42 +08:00
ZhangBiao b0d10a29d2 【公会】公会按钮位置调整 2021-07-22 17:41:01 +08:00
luyao 5555f33715 玲珑宝镜音效修改提交 2021-07-22 17:25:17 +08:00
DESKTOP-98AVA47\Administrator 916230ead6 音效添加 2021-07-22 17:04:03 +08:00
ZhangBiao 056d3dc094 Merge branch 'china/dev' into 0优化/副本界面 2021-07-22 17:01:32 +08:00
ZhangBiao 789c6b3d91 【新副本界面】上方不可点击修改 2021-07-22 17:01:10 +08:00
DESKTOP-98AVA47\Administrator 1c75527f36 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-22 16:41:13 +08:00
DESKTOP-98AVA47\Administrator 5684cbd89f 修改资源名称错误 2021-07-22 16:41:10 +08:00
DESKTOP-98AVA47\Administrator 2424a8090b 添加玲珑宝镜音效 2021-07-22 16:40:53 +08:00
jiaoyangna 7959f803c4 取消注释 2021-07-22 16:15:47 +08:00
jiaoyangna b0f868485e 无尽秘宝推送 2021-07-22 16:05:58 +08:00
jiaoyangna 997eae4e2c 已获得修改提交 2021-07-22 15:48:56 +08:00
ZhangBiao db258d27cb 【副本界面】调整 2021-07-22 15:13:24 +08:00
luyao d63abe2679 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-22 15:12:04 +08:00
luyao ed9ea5c3f9 bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/22,15:11:34 2021-07-22 15:11:34 +08:00
jiaoyangna 457ee33353 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-22 14:17:44 +08:00
jiaoyangna ce8751bbee 乾坤宝盒 提示修改 2021-07-22 14:17:40 +08:00
ZhangBiao 190f3722a8 Merge branch 'china/dev' into 0优化/副本界面 2021-07-22 14:04:11 +08:00
ZhangBiao 63c2a33c84 【报错修改】 2021-07-22 11:40:13 +08:00
ZhangBiao 5fa9f25c09 【点将台】白片修改 2021-07-22 10:53:27 +08:00
ZhangBiao 443ecf9112 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-22 10:36:45 +08:00
ZhangBiao b7d7b3270a 【主题活动】分页处理 2021-07-22 10:36:35 +08:00
zhangqiang 5c5edd8a13 【资源冲突处理】 2021-07-22 10:28:50 +08:00
zhangqiang e28d538565 【资源冲突处理】 2021-07-22 10:23:09 +08:00
ZhangBiao 2bf92fdfdd Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-21 18:37:25 +08:00
ZhangBiao 683e0eefc4 【心愿抽卡】界面调整 2021-07-21 18:37:15 +08:00
jiaoyangna 5150fd2edf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-21 18:27:17 +08:00
jiaoyangna c131d41d58 装备界面改动 2021-07-21 18:27:03 +08:00
ZhangBiao 30edf664da Merge branch 'china/dev' into 0优化/新增心愿神将提示 2021-07-21 18:26:34 +08:00
ZhangBiao 2b08ff111e 【心愿抽卡】去除log 2021-07-21 18:26:12 +08:00
ZhangBiao 183cd238d3 【心愿抽卡】完成 2021-07-21 18:22:24 +08:00
jiaoyangna 1d2ed2a4f7 装备详情弹窗下方获取途径位置显示错误 2021-07-21 18:03:23 +08:00
jiaoyangna 8477043738 装备详情弹窗下方获取途径位置显示错误 2021-07-21 17:38:27 +08:00
ZhangBiao b0e53312e7 【心愿抽卡】增加英雄加入卡池的天数条件 2021-07-21 17:35:38 +08:00
jiaoyangna 399d90809d 装备详情弹窗下方获取途径位置显示错误 2021-07-21 17:32:07 +08:00
jiaoyangna d1abaf403c 装备详情弹窗下方获取途径位置显示错误 2021-07-21 17:23:14 +08:00
JLIOSM1 d680e5a507 Merge commit 'fb5b009ec8abd5dbb8dd9658f0e8ded91c409fbb' into china/ios
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelTrialPanel.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpSoul.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanelNew.lua.meta
#	Assets/StreamingAssets/Res/PackConfig.txt
#	Assets/StreamingAssets/Res/_ReadMe.md
#	Assets/StreamingAssets/Res/dl_ui_effect_bg.png
#	Assets/StreamingAssets/Res/dl_ui_effect_bg.png.meta
#	Assets/StreamingAssets/Res/dl_ui_effect_mingzi_zh.png
#	Assets/StreamingAssets/Res/dl_ui_effect_mingzi_zh.png.meta
#	Assets/StreamingAssets/Res/loading1.png
#	Assets/StreamingAssets/Res/loading1.png.meta
#	Assets/StreamingAssets/Res/loading2.png
#	Assets/StreamingAssets/Res/loading2.png.meta
#	Assets/StreamingAssets/Res/loading3.png
#	Assets/StreamingAssets/Res/loading3.png.meta
#	Assets/StreamingAssets/Res/loading4.png
#	Assets/StreamingAssets/Res/loading4.png.meta
#	Assets/StreamingAssets/Res/loading5.png
#	Assets/StreamingAssets/Res/loading5.png.meta
#	Assets/StreamingAssets/Res/loading6.png
#	Assets/StreamingAssets/Res/loading6.png.meta
#	Assets/StreamingAssets/Res/loading_caohua.png.meta
#	Assets/StreamingAssets/Res/loading_xipu.png.meta
#	Assets/StreamingAssets/Res/login_caohua.png.meta
#	Assets/StreamingAssets/Res/login_video.mp4.meta
#	Assets/StreamingAssets/Res/login_xipu.png.meta
2021-07-21 17:15:36 +08:00
jiaoyangna 4442b9c38b 【ID1017598】
【灵兽白泽活动】点击查看红色装备TIPS后,切换至灵兽白泽互动点击金色装备,弹出的装备TIPS中会多出套装属性
2021-07-21 16:54:38 +08:00
JLIOSM1 e694302cac 【MapPlayerView】随机方法修改 2021-07-21 16:41:33 +08:00
jiaoyangna cc0e0c20cb 【ID1017607】
【仙缘汇聚箱】箱子可领取点击后关闭,动效消失,切换界面箱子再次跳动
2021-07-21 16:19:36 +08:00
JLIOSM1 3027e991c9 【IOS提审】提审服关闭公会红包,无尽秘宝按钮显示 2021-07-21 14:55:47 +08:00
jiaoyangna e2f381b11a 【ID1017469】
【五星成长礼拍脸】背包界面合成五星神将,切到关卡或主城才给拍脸
2021-07-21 11:53:26 +08:00
jiaoyangna 896bf742c1 【ID1017463】
【超值基金】在界面刷新后页签和主城入口没红点,重登正常
2021-07-21 11:37:04 +08:00
JLIOSM1 c2dfe0ee92 【IOS提审】链接提审服时,部分按钮跳转到妖晶充值 2021-07-21 11:33:09 +08:00
JLIOSM1 557d19910d 【屏幕适配】优化剧情界面在宽屏设备下的显示 2021-07-21 11:30:13 +08:00
jiaoyangna 740592309d 【ID1017508】
【点将台】道具足够10连抽时,10连按钮没有红点
2021-07-21 11:22:56 +08:00
zhangqiang a359ff284f 【跨服主城按钮修改】 2021-07-20 18:32:02 +08:00
zhangqiang b395410ac1 Merge branch 'china/dev' into china/dev_c_跨服天梯
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
2021-07-20 18:09:07 +08:00
jiaoyangna f3ada0f401 时间间隔修改 2021-07-20 17:18:20 +08:00
jiaoyangna 5cac652fa3 滑动修改提交 2021-07-20 17:08:36 +08:00
jiaoyangna 1e80b80c82 四元阵修改提交 2021-07-20 15:42:11 +08:00
jiaoyangna 058cd565d3 抽卡动画修改提交 2021-07-20 14:52:55 +08:00
jiaoyangna f0337c6ce8 抽卡修改提交 2021-07-20 14:31:31 +08:00
jiaoyangna ee26dc5196 跳转修改提交 2021-07-20 14:18:28 +08:00
jiaoyangna a88bebb284 滑动修改提交 2021-07-20 14:02:16 +08:00
jiaoyangna acbdf46600 跳转 修改提交 2021-07-20 13:46:13 +08:00
jiaoyangna 7cf1150c52 四元阵预设修改提交 2021-07-20 12:37:14 +08:00
zhangqiang fbc490737b 【公会】在公会界面散会,黑屏 2021-07-20 11:09:43 +08:00
DESKTOP-98AVA47\Administrator 625afbec42 四元阵修改提交 2021-07-20 10:27:43 +08:00
DESKTOP-98AVA47\Administrator f6ecf740b7 抽卡选中按钮修改 2021-07-20 10:24:33 +08:00
DESKTOP-98AVA47\Administrator 8168d284f0 跳转提交 2021-07-20 10:20:41 +08:00
DESKTOP-98AVA47\Administrator 3673a84edf 点将台乱点错误修改 2021-07-20 10:08:06 +08:00
DESKTOP-98AVA47\Administrator 2f9a357023 跳转修改提交 2021-07-19 21:58:45 +08:00
DESKTOP-98AVA47\Administrator ee84f39794 四元阵 报错修改 2021-07-19 21:35:11 +08:00
wangzhenxing 2490fbb496 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-19 17:34:37 +08:00
wangzhenxing 38d384e9a7 [bug]=========【ID1017466】
【首充按钮】武将预览修改成神将预览
2021-07-19 17:34:04 +08:00
ZhangBiao effe3bdfa1 【十绝阵】跨天状态刷新 2021-07-19 17:30:17 +08:00
ZhangBiao d19d2f7dd3 【优化】心愿抽卡将孙悟空从心愿池去除 2021-07-19 15:50:35 +08:00
zhangqiang 99cad10435 【跨服天梯】国内提交+1 2021-07-19 15:49:48 +08:00
ZhangBiao 8df0d462f8 【惊喜礼盒】顺序错乱修改 2021-07-19 13:51:57 +08:00
jiaoyangna a8523745fb 抽卡界面 选中位置修改提交 2021-07-19 11:58:43 +08:00
jiaoyangna 61a2da78cd 超值基金跳转 2021-07-19 11:48:41 +08:00
DESKTOP-98AVA47\Administrator 9331a9916d 概率修改提交 2021-07-19 11:31:13 +08:00
DESKTOP-98AVA47\Administrator 13e6b5e522 乾坤宝盒报错修改提交 2021-07-19 10:59:13 +08:00
liujiaqi 57fade3e9d 罗浮争锋称号 2021-07-28 10:31:29 +08:00
jiaoyangna b966fec333 幸运探宝十连报错修改 2021-07-17 10:14:25 +08:00
luyao 9a65f93211 玲珑宝镜修改 2021-07-16 19:12:35 +08:00
jiaoyangna 17d01c95ea Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-16 19:03:45 +08:00
jiaoyangna 05d12558b7 玲珑宝镜 2021-07-16 19:03:41 +08:00
wangzhenxing 59b36cbf94 [战斗]==========被动292 修改 追加得技能一次行动只追加一次,且不触发任何特性 2021-07-16 18:36:52 +08:00
jiaoyangna f631bb3c15 玲珑宝镜修改提交 2021-07-16 18:11:50 +08:00
jiaoyangna 6ed3b05885 四元阵修改提交 2021-07-16 17:59:22 +08:00
jiaoyangna ea704d62c3 Revert "四元阵修改提交"
This reverts commit f33d64871a.
2021-07-16 17:58:13 +08:00
jiaoyangna f33d64871a 四元阵修改提交 2021-07-16 17:57:45 +08:00
jiaoyangna 05358f15f5 玲珑宝镜修改提交 2021-07-16 17:52:33 +08:00
jiaoyangna 4f0f69b17e 玲珑报警 2021-07-16 17:41:56 +08:00
jiaoyangna c1a7cba724 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-16 17:41:41 +08:00
jiaoyangna a2fa26e67e 玲珑宝镜修改提交 2021-07-16 17:41:38 +08:00
ZhangBiao 309486e443 【点将台】报错修改提交 2021-07-16 16:54:17 +08:00
luyao 8aeb433618 玲珑宝镜道具图标 ——镜纹秘钥 2021-07-16 16:44:02 +08:00
jiaoyangna ef35e0bca0 玲珑宝镜帮助修改提交 2021-07-16 16:24:56 +08:00
jiaoyangna 360a8d3cae 主题活动限时召唤,乾坤宝盒卡死提交 2021-07-16 16:23:35 +08:00
wangzhenxing a70f45e7a5 [乾坤宝盒]==========提示文字颜色修改 2021-07-16 16:19:59 +08:00
gaoxin 2cc76fd123 Merge branch 'china/ios' into china/dev 2021-07-16 15:57:29 +08:00
jiaoyangna 2d6f5f3fb1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-16 15:51:12 +08:00
jiaoyangna bec2eca580 适配修改 2021-07-16 15:51:06 +08:00
JLIOSM1 56e7492a91 【商店】修复妖精商店资源回收导致白片 2021-07-16 15:37:48 +08:00
luyao aa3c2f7694 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-16 15:16:02 +08:00
luyao 3baf85791e 主题活动,限时召唤中。【更换武将】图片资源替换为【更换神将】 2021-07-16 15:15:25 +08:00
wangzhenxing d6226e77bf [乾坤宝盒]=====魂印详情修改提交 2021-07-16 15:11:53 +08:00
DESKTOP-98AVA47\Administrator 324ba7bc57 文字内容修改提交 2021-07-16 15:04:09 +08:00
gaoxin 1361261bd6 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-16 14:49:53 +08:00
gaoxin e34f6a79cb 【log】关闭鸿蒙阵推送log 2021-07-16 14:49:35 +08:00
DESKTOP-98AVA47\Administrator 6aeea9a736 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-16 14:46:31 +08:00
DESKTOP-98AVA47\Administrator aae52de39b 去掉已获得屏蔽 2021-07-16 14:46:21 +08:00
gaoxin 912945a782 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-16 14:42:22 +08:00
gaoxin 27bfa3979a 【登录】登录页加载Stream目录中的视频 2021-07-16 14:42:16 +08:00
DESKTOP-98AVA47\Administrator 102930f792 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-16 14:28:36 +08:00
DESKTOP-98AVA47\Administrator b253745ab0 超值基金特效修改 2021-07-16 14:28:26 +08:00
wangzhenxing 3c5a51a10c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-16 14:21:07 +08:00
wangzhenxing 65a6edeba5 [乾坤宝盒]======改成只能选择3个 2021-07-16 14:20:25 +08:00
DESKTOP-98AVA47\Administrator 0aa779f177 添加左右切换按钮 2021-07-16 14:18:25 +08:00
DESKTOP-98AVA47\Administrator 4d11ade910 四元阵修改 2021-07-16 14:09:53 +08:00
DESKTOP-98AVA47\Administrator 328a382d4c 奖池预览页签修改提交 2021-07-16 11:55:43 +08:00
DESKTOP-98AVA47\Administrator 0a4ef7e68d 心愿抽卡修改提交 2021-07-16 11:40:08 +08:00
DESKTOP-98AVA47\Administrator 710b8b2f1b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-16 11:19:40 +08:00
DESKTOP-98AVA47\Administrator 60132143c7 新手引导修改提交 2021-07-16 11:19:36 +08:00
luyao 82e5b6fd5c 【点将台抽卡】召唤标题修改(猎妖师 变为 神将) 2021-07-16 11:05:42 +08:00
DESKTOP-98AVA47\Administrator 04c9ab3b6b 抽卡修改提交 2021-07-16 10:30:56 +08:00
DESKTOP-98AVA47\Administrator 59de7adf87 去掉宝箱bilingbiling 2021-07-16 10:26:08 +08:00
DESKTOP-98AVA47\Administrator c688666e99 向左滑动修改提交 2021-07-16 10:18:57 +08:00
DESKTOP-98AVA47\Administrator 89925e511a 抽卡调整 2021-07-16 10:15:59 +08:00
DESKTOP-98AVA47\Administrator e7187d75c4 预设调整,左右红点切换界面调整 2021-07-16 10:12:41 +08:00
JLIOSM1 808efb6764 【延长登录界面的打开事件】 2021-07-15 23:08:41 +08:00
JLIOSM1 d2dd9401f4 【登录】提审服不再显示公告 2021-07-15 23:04:59 +08:00
JLIOSM1 3ca8ee5259 【引导】修复新手引导跳转界面导致界面无法销毁的问题 2021-07-15 23:04:07 +08:00
luyao b8afca215b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-15 21:10:50 +08:00
luyao 2fbecd6584 文字修改提交 2021-07-15 21:10:37 +08:00
DESKTOP-98AVA47\Administrator af7e58f531 位置修改 2021-07-15 21:02:42 +08:00
DESKTOP-98AVA47\Administrator 08b9873d25 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-15 20:48:51 +08:00
DESKTOP-98AVA47\Administrator 53dadfff49 抽卡修改提交 2021-07-15 20:48:46 +08:00
wangzhenxing 908f15bf49 [乾坤宝盒]===========预设特效修改提交 2021-07-15 20:17:51 +08:00
DESKTOP-98AVA47\Administrator 9b413e06e2 神将抽加号修改 2021-07-15 20:08:06 +08:00
DESKTOP-98AVA47\Administrator dda2c78b05 预设修改提交 2021-07-15 19:59:54 +08:00
ZhangBiao d639f0ccd3 资源名重复 2021-07-15 19:57:30 +08:00
DESKTOP-98AVA47\Administrator fc1a2bca84 文字颜色修改提交 2021-07-15 19:53:08 +08:00
ZhangBiao 9cfca39bb1 Merge branch 'china/dev' into 0优化/副本界面 2021-07-15 19:48:59 +08:00
ZhangBiao 7e17f8c3a1 Merge branch 'china/dev' into 0优化/副本界面
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2021-07-15 19:48:50 +08:00
DESKTOP-98AVA47\Administrator 385dcb9c90 位置修改交 2021-07-15 19:47:04 +08:00
ZhangBiao 88bd6a9801 【新副本】完成? 2021-07-15 19:46:43 +08:00
DESKTOP-98AVA47\Administrator 9b97a35ce8 mata 文件修改提交 2021-07-15 19:44:55 +08:00
DESKTOP-98AVA47\Administrator 3ee8153112 抽卡界面修改 2021-07-15 19:40:09 +08:00
DESKTOP-98AVA47\Administrator 6d4bf07c21 【ID1009654】
【优化】优化抽卡界面
2021-07-15 19:38:10 +08:00
DESKTOP-98AVA47\Administrator 01a2171a31 【ID1009654】
【优化】优化抽卡界面
2021-07-15 19:33:34 +08:00
DESKTOP-98AVA47\Administrator 18cc7ec6a4 红点报错修改提交 2021-07-15 19:20:20 +08:00
DESKTOP-98AVA47\Administrator 695a61abaa Merge branch '0优化/主题活动' into china/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
2021-07-15 18:52:59 +08:00
DESKTOP-98AVA47\Administrator c5ceba8603 【ID1009654】
【优化】优化抽卡界面
2021-07-15 18:51:51 +08:00
DESKTOP-98AVA47\Administrator 798d4d9a4e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-15 18:23:27 +08:00
DESKTOP-98AVA47\Administrator 7eb776f699 【ID1009829】
升星界面的进阶要求改成进阶预览
2021-07-15 18:23:17 +08:00
wangzhenxing 4d428fd383 [战斗]==========被动292 ,319 修改 2021-07-15 18:20:38 +08:00
ZhangBiao edaacd0e69 重复名资源提交 2021-07-15 17:24:56 +08:00
wangzhenxing e2f4a55226 【乾坤宝盒】=============协议提交 2021-07-15 17:19:41 +08:00
wangzhenxing fe8714f7fa [乾坤宝盒]========优化提交 2021-07-15 16:43:35 +08:00
DESKTOP-98AVA47\Administrator 27b0f524f9 协议提交 2021-07-15 16:40:48 +08:00
DESKTOP-98AVA47\Administrator 4bd4f1f483 Merge branch '0功能/玲珑宝镜' into china/dev
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
2021-07-15 16:24:35 +08:00
DESKTOP-98AVA47\Administrator 55607708df 资源修改提交 2021-07-15 16:19:27 +08:00
ZhangBiao 109a109301 Merge branch 'china/dev' into 0优化/副本界面
# Conflicts:
#	Assets/ManagedResources/Atlas/CarbonNewAtlas.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/QianKunBox/ArtFont.meta
#	Assets/ManagedResources/BG/Map/Endless4/dhlg_1.jpg.meta
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/StreamingAssets/Android.meta
2021-07-15 16:19:05 +08:00
ZhangBiao 7d4c8b6c3f 【山河试炼】 2021-07-15 16:08:39 +08:00
ZhangBiao 7075049c45 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-15 15:58:58 +08:00
ZhangBiao 4c5a8b73ef 【山河试炼】奖励顺序错乱修改 2021-07-15 15:58:49 +08:00
DESKTOP-98AVA47\Administrator 25ffe0ff1f 玲珑宝镜特效提交 2021-07-15 15:58:01 +08:00
ZhangBiao dd8f907259 【副本界面】提交 2021-07-15 15:54:18 +08:00
ZhangBiao e3baabda96 【副本界面】特效提交 2021-07-15 15:25:25 +08:00
wangzhenxing 5985853669 [乾坤宝盒]========功能修改 2021-07-15 15:12:40 +08:00
wangzhenxing fcaa098564 [乾坤宝盒]===========功能修改 2021-07-15 14:57:34 +08:00
DESKTOP-98AVA47\Administrator 25939d4d25 玲珑宝镜特效上传 2021-07-15 14:44:19 +08:00
ZhangBiao 37dd3100b9 【心愿抽卡】文字内容颜色调整 2021-07-15 13:44:46 +08:00
DESKTOP-98AVA47\Administrator 36f04065fc Merge branch 'china/dev' into 0优化/主题活动
# Conflicts:
#	Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_1280.png
#	Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_1280.png.meta
#	Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_3280.png
#	Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_3280.png.meta
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
2021-07-15 12:59:20 +08:00
ZhangBiao 32654b045a 抽卡资源提交 2021-07-15 11:57:24 +08:00
wangzhenxing c3da0a2df8 [乾坤宝盒]=============优化提交 2021-07-15 11:14:32 +08:00
skuld 7845904c32 红点位置修改提交 2021-07-15 10:48:07 +08:00
zhangqiang d9ca231e57 【跨服天梯】国内提交+1 2021-07-14 22:17:16 +08:00
zhangqiang c3a456af52 【跨服天梯】国内提交+1 2021-07-14 22:12:40 +08:00
zhangqiang 6a3c48e0b8 【跨服天梯】国内提交+1 2021-07-14 21:43:03 +08:00
zhangqiang 3b9af50a15 【跨服天梯】国内提交+1 2021-07-14 20:52:54 +08:00
zhangqiang b034028ad1 【跨服天梯】国内提交+1 2021-07-14 20:47:49 +08:00
zhangqiang 98362ef902 【跨服天梯】国内提交+1 2021-07-14 20:27:04 +08:00
ZhangBiao 491a48fe95 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-14 20:00:54 +08:00
ZhangBiao 3d7baa815e 【山河试炼】红点报错修改 2021-07-14 20:00:44 +08:00
zhangqiang 1f8d19f3d8 【跨服天梯】国内提交+1 目标被其他玩家击败后,点击挑战仍有问题 2021-07-14 19:07:05 +08:00
luyao 3565338eb8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-14 18:25:34 +08:00
luyao d9c3b4cefe 超值基金图片修改提交 2021-07-14 18:25:26 +08:00
wangzhenxing e0d680da50 [乾坤宝盒]=============功能提交 2021-07-14 18:20:04 +08:00
ZhangBiao bc55cf3a19 Merge branch 'china/dev' into 0功能/山河试炼
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
2021-07-14 18:08:46 +08:00
wangzhenxing ca95dcb71e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-14 18:05:56 +08:00
wangzhenxing 070fabb0a6 [乾坤宝盒]=========添加常量 2021-07-14 18:05:37 +08:00
zhangqiang 18d24b638f 【跨服天梯】国内提交+1 2021-07-14 17:41:26 +08:00
jiaoyangna 5f3e305613 描述修改提交 2021-07-14 17:18:13 +08:00
jiaoyangna 18e4652994 【ID1009791】 幸运探宝够12张券时开启红点提示 2021-07-14 17:05:50 +08:00
jiaoyangna c3d42bc536 超值基金图片修改
(cherry picked from commit 771c79feff)
2021-07-14 17:00:30 +08:00
jiaoyangna 7d5968f058 超值基金
(cherry picked from commit 7cca06a5d7)
2021-07-14 17:00:22 +08:00