Commit Graph

160 Commits (a2b96970cc0b51d4541e72eaad7d19a5575dc226)

Author SHA1 Message Date
gaoxin 0babcc640b 【报警】添加用于确认登录成功的接口,后端用于登录监测告警 2021-02-25 14:33:23 +08:00
zhangqiang 5699b89258 【ScrollCycleView】修改3 2021-02-25 12:04:31 +08:00
zhangqiang dc42a492e7 【排行榜优化】排行榜信息分页读取 2021-02-24 10:13:43 +08:00
zhangqiang dd84a4bd3f 【鸿蒙阵】第一次激活鸿蒙碑的时候 两个329 替换位置 重置1级 错误bug 修复 2021-02-20 16:29:36 +08:00
zhangqiang 39686223d0 【鸿蒙阵】一键上阵 2021-02-20 11:37:56 +08:00
zhangqiang 1c95b576f0 Merge branch '0功能/鸿蒙门阵' into 0功能/本周版本优化内容
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/View/ScrollCycleView.lua
2021-02-19 10:54:36 +08:00
ZhangBiao 78bc7e8ab3 Merge branch '0功能/本周版本优化内容' into 0活动开发聚集地/牛转乾坤 2021-01-26 13:49:08 +08:00
ZhangBiao 3d21af1999 【邮件领取】领取邮件bug修复 2021-01-25 16:00:57 +08:00
ZhangBiao 9e14cada49 【牛转钱坤】完事了 2021-01-21 15:10:27 +08:00
gaoxin 606b98aadd 【数数】尝试使用数数的设备id 2021-01-20 15:34:33 +08:00
DESKTOP-98AVA47\Administrator 040971534e 【巅峰赛限时头像修改】 2021-01-15 21:06:48 +08:00
guowei a25db7d09c 【鸿蒙阵bug修改】 2021-01-14 14:09:13 +08:00
guowei 3f8312953e Merge branch 'master_xma_local' into 0功能/鸿蒙门阵 2021-01-14 10:20:12 +08:00
ZhangBiao a75d553a6a 【无尽副本】世界等级显示1级 修改 2021-01-13 11:04:28 +08:00
jiaoyangna be993c9905 【优化】心魔试炼高级阶段奖励没有展示,添加层数奖励 2021-01-12 19:21:20 +08:00
guowei c252f1bae6 【鸿蒙阵修改】 2021-01-09 14:30:35 +08:00
ZhangBiao d09bc60b5e 【森罗幻境】红点刷新修改 2021-01-08 19:08:04 +08:00
guowei 6c191263bd Merge branch 'master_xma_local' into 0功能/鸿蒙门阵
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/ArenaInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/CommonProto.proto
#	Assets/ManagedResources/~Lua/Message/Expedition.proto
#	Assets/ManagedResources/~Lua/Message/Family.proto
#	Assets/ManagedResources/~Lua/Message/FightInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/HeroInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/MapInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto.proto
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto.proto
#	Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua
2021-01-06 20:05:35 +08:00
ZhangBiao 31c5aa7580 【森罗幻境】红点刷新修改 2021-01-06 17:30:48 +08:00
guowei 088e19b73e 【鸿蒙阵修改】 2021-01-05 20:44:14 +08:00
ZhangBiao fc8f74cd3a 【森罗幻境】在进入下一层后,下方的神将头像位置会发生变化 修复 2021-01-04 10:41:35 +08:00
guowei 30b0c26a6e 【鸿蒙阵】 2021-01-04 09:57:42 +08:00
zhangqiang a6d16c13e5 【寻宝】加锁 2020-12-30 18:08:44 +08:00
guowei ca9a6a933b 【鸿蒙阵修改】 2020-12-29 20:36:37 +08:00
zhangqiang 739f390115 Merge branch 'master_xma_local' into 0功能/1月6_版本优化
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua
2020-12-29 17:00:08 +08:00
zhangqiang 35f211a2a4 【工会技能】 优化 连续升级 2020-12-29 16:15:11 +08:00
guowei 4939dd69b8 【鸿蒙阵修改】 2020-12-28 20:02:36 +08:00
ZhangBiao c649621d85 【森罗幻境】下方头像顺序,后端把顺序换了 2020-12-28 15:19:46 +08:00
zhangqiang f553b7275d 【跨服天梯】世界等级 加空推送协议 2020-12-28 14:27:52 +08:00
zhangqiang 7729c433e7 【跨服天梯】加一个空推送 2020-12-28 13:56:06 +08:00
gaoxin bf6fd2d13d Merge remote-tracking branch 'origin/0活动开发聚集地/新将活动3个' into master_xma_local
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/View/UpView.lua
2020-12-26 20:22:23 +08:00
guowei d36276eb0c 【鸿蒙阵修改】 2020-12-26 15:07:51 +08:00
jiaoyangna d5d30fd6a8 刷新礼包修改 2020-12-26 11:47:16 +08:00
ZhangBiao 6945cbcacf 【森罗幻境】红点修改 2020-12-25 12:05:23 +08:00
guowei b09bf01c54 【鸿蒙阵bug修改】 2020-12-24 16:16:53 +08:00
guowei 130ee0c212 【鸿蒙阵临时改版】 2020-12-24 14:43:32 +08:00
ZhangBiao 30f8049ef5 Merge branch '0活动开发聚集地/新将来袭' into 0活动开发聚集地/新将活动3个
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
#	Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2020-12-23 11:13:48 +08:00
guowei ef02f1b6e9 【鸿蒙阵更新】 2020-12-21 18:19:38 +08:00
gaoxin ef1ced3ef7 【战报系统】基础功能添加 2020-12-18 16:51:13 +08:00
guowei 4f4542d53a 【鸿蒙阵】 2020-12-18 13:39:35 +08:00
guowei 52d493ebc7 【鸿蒙阵】二次提交 2020-12-17 10:41:00 +08:00
guowei 861b02f0c8 【鸿蒙阵初版】 2020-12-15 11:03:34 +08:00
ZhangBiao 4c73219b39 【森罗幻境】诸多bug 修复 2020-12-12 18:00:18 +08:00
ZhangBiao 86d190572a 【神将来袭】加战斗了 2020-12-02 17:14:52 +08:00
DESKTOP-98AVA47\Administrator 15eebe4584 【鸿蒙阵】 初版提交 2020-11-27 17:59:25 +08:00
zhangqiang 80c949c54d 【灵兽】 灵兽数据分页 2020-11-27 10:57:50 +08:00
zhangqiang 899903104f 【特权礼包】加等级显示前端
【公会副本】 加前端五点刷新不能扫荡
2020-11-19 19:30:46 +08:00
ZhangBiao 68cf2e356a 【竞技场】在线刷新没红点修复 2020-12-03 05:10:15 +08:00
ZhangBiao 04f8571692 【天宫秘宝】领取宝箱积分后秘宝红点不刷新修复 2020-11-17 11:53:49 +08:00
ZhangBiao 8df6de20e5 【副本】isInMap字段删除bug修复 2020-11-16 15:24:09 +08:00