Commit Graph

563 Commits (54448208dfae1d740ab70f07f5df9dd72e8f62f4)

Author SHA1 Message Date
zhangqiang 98649b66c1 【跨服排行】 2021-07-30 17:52:49 +08:00
zhangqiang 78ec831ca1 【跨服详情】修改提交 2021-07-30 11:59:39 +08:00
gaoxin a61602eae4 【角色信息】删除服务器名称只在JUMPSERVER类型下显示的限制 2021-07-29 11:50:59 +08:00
gaoxin 1b3e5c196b 【跨服聊天】完善跨服聊天角色信息显示 2021-07-29 11:46:59 +08:00
zhangqiang 1969dd31ab Revert "【跨服切磋】"
This reverts commit cc8974c016.
2021-07-29 11:11:16 +08:00
zhangqiang cc8974c016 【跨服切磋】 2021-07-28 18:38:06 +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
zhangqiang 9a2d9c70a7 【新功能】罗浮争锋排行榜增加跨服切磋功能 2021-07-28 15:48:35 +08:00
jiaoyangna 4805b041e8 宝物使用跳转错误修改 2021-07-28 15:07:57 +08:00
jiaoyangna 1123d9dc2d 宝物修改提交 2021-07-28 11:52:47 +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
ZhangBiao 8a90b87942 【新副本界面】心魔次数文字错误修改,和弹窗修改 2021-07-23 17:43:30 +08:00
DESKTOP-98AVA47\Administrator 6f8cb042bb 报错修改提交 2021-07-23 11:17:50 +08:00
zhangqiang 1cf142c82b 【跨服天梯】国内提交+1 2021-07-22 19:01:46 +08:00
ZhangBiao 30edf664da Merge branch 'china/dev' into 0优化/新增心愿神将提示 2021-07-21 18:26:34 +08:00
jiaoyangna 1d2ed2a4f7 装备详情弹窗下方获取途径位置显示错误 2021-07-21 18:03:23 +08:00
ZhangBiao b0e53312e7 【心愿抽卡】增加英雄加入卡池的天数条件 2021-07-21 17:35:38 +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
zhangqiang 99cad10435 【跨服天梯】国内提交+1 2021-07-19 15:49:48 +08:00
wangzhenxing 65a6edeba5 [乾坤宝盒]======改成只能选择3个 2021-07-16 14:20:25 +08:00
wangzhenxing fe8714f7fa [乾坤宝盒]========优化提交 2021-07-15 16:43:35 +08:00
wangzhenxing fcaa098564 [乾坤宝盒]===========功能修改 2021-07-15 14:57:34 +08:00
wangzhenxing c3da0a2df8 [乾坤宝盒]=============优化提交 2021-07-15 11:14:32 +08:00
wangzhenxing e0d680da50 [乾坤宝盒]=============功能提交 2021-07-14 18:20:04 +08:00
zhangqiang f7932b9e8c 【罗浮争锋】国内提交+1 2021-07-13 17:40:25 +08:00
zhangqiang 5162b3247c 【跨服天梯】国内提交+1 2021-07-13 11:28:36 +08:00
jiaoyangna 763c45ebd0 【ID1017258】
【碎片合成】碎片仅够合成一个神将时,合成后不自动关闭道具详情界面

(cherry picked from commit 7371405fbd)
2021-07-12 11:16:54 +08:00
jiaoyangna a233fb2c7d 【ID1017258】
【碎片合成】碎片仅够合成一个神将时,合成后不自动关闭道具详情界面

(cherry picked from commit 4d588e2948)
2021-07-12 10:19:54 +08:00
jiaoyangna fa30243bf5 玉皇大帝修改提交
(cherry picked from commit 6ea9ee51c0)
2021-07-08 18:30:29 +08:00
jiaoyangna 9fa4e26f7e 仙缘汇聚箱修改提交 2021-07-05 09:55:02 +08:00
jiaoyangna 82f1650edf 神将来源定位描述错误修改 2021-07-02 12:11:29 +08:00
jiaoyangna 9b01d308e8 孙悟空添加新人商城 2021-07-02 11:13:59 +08:00
zhangqiang a2528a3ded 【去掉无用打印】 2021-07-01 21:07:53 +08:00
jiaoyangna 4f34d6ed42 神将来源返回时打开 2021-07-01 18:12:20 +08:00
jiaoyangna 8b187bfd5f 获取途径报错修改 2021-07-01 15:27:04 +08:00
jiaoyangna bb9b58d489 Merge branch '0功能/神将来源' into china/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
2021-06-30 19:57:49 +08:00
jiaoyangna 36cb3db3af 底图修改提交 2021-06-30 16:17:50 +08:00
jiaoyangna a4281ed031 四元阵跳转修改 2021-06-30 16:07:37 +08:00
jiaoyangna e44449391d 神将来源修改提交 2021-06-30 15:47:13 +08:00
jiaoyangna b5324c165a 神将来源碎皮合成修改提交 2021-06-30 15:27:27 +08:00
jiaoyangna a556ee7e2d 关闭界面时 称号预设未关闭 错误 问题修改 2021-06-30 14:10:30 +08:00
jiaoyangna ed1cf199a2 神将来源修改 2021-06-30 11:50:11 +08:00
jiaoyangna 58994f5a38 神将来源修改 2021-06-30 11:42:22 +08:00
jiaoyangna 6429cba1d4 代码报错修改 2021-06-30 11:37:33 +08:00
jiaoyangna de0b9be884 添加首充和至尊降世的 显示 2021-06-30 11:36:07 +08:00
jiaoyangna f834e2e17d 【ID1009590】
【神将信息】增加神将获取途径来源预览功能
2021-06-30 10:12:44 +08:00
jiaoyangna 37b7071ccf 【ID1009590】
【神将信息】增加神将获取途径来源预览功能
2021-06-29 20:05:15 +08:00
zhangqiang 6dc2f5e09f 【跨服天梯】国内提交2 2021-06-26 13:35:59 +08:00
gaoxin 04c89ccaa9 【月卡】月卡激活提示修改到关闭奖励界面之后 2021-06-19 15:45:13 +08:00
zhangqiang 4438ad6a72 【跨服天梯】国内首提 2021-06-15 20:08:14 +08:00