wangzhenxing
|
a58b5f2d88
|
玉虚论道提交
|
2021-09-09 11:48:09 +08:00 |
gaoxin
|
79832f3232
|
【碎片详情】碎片详情添加灵兽和神将的查看
|
2021-09-07 11:40:12 +08:00 |
gaoxin
|
11495d1076
|
【山河社稷图】修复奖励界面报错导致卡死
|
2021-09-06 11:45:30 +08:00 |
jiaoyangna
|
3ef0ad39b6
|
【ID1010167】
【乾坤宝盒】许愿魂印弹窗中,魂印图标下方添加道具名称
|
2021-09-01 20:06:09 +08:00 |
jiaoyangna
|
5b8001ce28
|
【ID1018329】
【宝物分解】背包界面分解宝物,分解后返回,依然弹出已被分解的宝物
(cherry picked from commit 41831fad79)
|
2021-09-01 19:36:19 +08:00 |
gaoxin
|
c325bf563f
|
Revert 回滚错误的合并 4f19f12612
|
2021-08-26 16:43:27 +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
|
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
|
e678864743
|
【魂灵宝】装备界面增加等级上限
|
2021-08-12 20:01:56 +08:00 |
ZhangBiao
|
939d577624
|
Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
|
2021-08-10 20:21:06 +08:00 |
ZhangBiao
|
edc728227c
|
【寻宝密宗】提交
|
2021-08-10 14:57:45 +08:00 |
zhangqiang
|
c957a96983
|
【玩家信息】玩家信息面板需要显示神将佩戴宝物的强化等级和精炼等级
|
2021-08-09 14:48:14 +08:00 |
zhangqiang
|
abb9873f80
|
【玩家信息】玩家信息面板需要显示神将佩戴宝物的强化等级和精炼等级
|
2021-08-04 17:42:47 +08:00 |
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 |