Commit Graph

172 Commits (f28818d4aad2616c5c68a7686df17fa645c12dad)

Author SHA1 Message Date
guowei f28818d4aa 【鸿蒙阵修改】 2021-01-07 21:45:22 +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
guowei a5109cd144 【鸿蒙阵bug修改】 2021-01-06 19:35:41 +08:00
DESKTOP-98AVA47\Administrator e5b2be7e81 【鸿蒙阵修改】 2021-01-12 00:55:02 +08:00
guowei 30b0c26a6e 【鸿蒙阵】 2021-01-04 09:57:42 +08:00
guowei ca9a6a933b 【鸿蒙阵修改】 2020-12-29 20:36:37 +08:00
jiaoyangna 1cf3f17888 【优化】神将解锁锁定状态基本看不出来,让其更加明显 2020-12-29 14:23:53 +08:00
jiaoyangna d85bd9c3aa 【优化】背包分类优化 2020-12-28 16:25:38 +08:00
guowei d989aa5b85 【鸿蒙阵bug修改】 2020-12-28 13:37:30 +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
wangzhenxing 96f31b63ad [优化]魂宝灵宝加号点击区域扩大 2020-12-26 19:45:44 +09:00
wangzhenxing e4596beb99 【宝物】==========宝物添加加号提示 2020-12-26 19:44:48 +09:00
guowei d36276eb0c 【鸿蒙阵修改】 2020-12-26 15:07:51 +08:00
guowei 5eb853efbd 【鸿蒙阵bug修改】 2020-12-25 15:33:12 +08:00
guowei 2ac574ff06 【鸿蒙阵bug】更新 2020-12-23 17:41:31 +08:00
zhangqiang 1ba79f4627 【装备页面】神将一键装备功能提示 已为最强装备 2020-12-23 16:46:41 +08:00
ZhangBiao 38a1eeee9a Merge branch '0活动开发聚集地/升星有礼' into 0活动开发聚集地/新将活动3个
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
2020-12-23 11:29:12 +08:00
guowei 0dd211f896 【鸿蒙阵】更新 2020-12-22 15:41:45 +08:00
zhangqiang 4db72018cb 【鸿蒙阵】 提示变更 2020-12-22 09:52:40 +08:00
gaoxin a0f059ca9b 【皮肤】修复未解锁皮肤,拖动不切换回到默认位置时显示错误 2020-12-21 18:45:58 +08:00
ZhangBiao 12760d7cb1 【升星有礼】完成 2020-12-21 15:41:31 +08:00
zhangqiang 4b49661f24 【鸿蒙阵】修改 2020-12-18 18:25:38 +08:00
zhangqiang 00980feb57 Merge branch '0功能/鸿蒙门阵' of http://60.1.1.230/gaoxin/JL_Client into 0功能/鸿蒙门阵 2020-12-18 16:38:03 +08:00
zhangqiang e09ed9fdfc 【鸿蒙阵】 限制 2020-12-18 16:37:56 +08:00
guowei f744e609a1 【鸿蒙阵剩余图片】 2020-12-18 16:31:28 +08:00
guowei 52d493ebc7 【鸿蒙阵】二次提交 2020-12-17 10:41:00 +08:00
zhangqiang 328af3f66b 【装备套装】 2020-12-12 17:07:22 +08:00
zhangqiang 03e0e73665 【装备套装】 套装属性向下兼容 2020-12-11 17:31:11 +08:00
zhangqiang cae41baf71 【图鉴】 升星点亮图鉴 调整献祭坛预设 2020-11-17 10:57:16 +08:00
zhangqiang 2000240f64 【觉醒】 提示文字 2020-11-16 14:57:46 +08:00
zhangqiang 2f5b2c2d4f 【觉醒】 觉醒成功界面显示bug 2020-11-13 10:11:41 +08:00
zhangqiang cbf9f5cade 【觉醒】问题修改 2020-11-12 13:55:46 +08:00
zhangqiang 0ca5e4ea13 【觉醒】bug 2020-11-11 20:21:37 +08:00
zhangqiang adf9c87ac2 【灵兽提交】bug修改 2020-11-11 20:21:13 +08:00
zhangqiang 629eb98f1b Merge branch 'master_xma_local' into 0功能/神将觉醒 2020-11-11 11:37:26 +08:00
zhangqiang 90e9e84c64 【觉醒】十一星的星级展示修改 2020-11-11 11:12:14 +08:00
zhangqiang 053de93608 【神将觉醒】 提交 2020-11-10 18:35:37 +08:00
zhangqiang 48e6d33b7b 【神将觉醒】 效果图 资源 提交 2020-11-10 17:29:38 +08:00
jiaoyangna 22d3761937 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-10 10:24:07 +08:00
jiaoyangna 3f7ae45011 皮肤修改 2020-11-10 10:23:55 +08:00
zhangqiang 6278bb0cc8 【神将升级】 升星未卡住 and 神将合成报错 2020-11-10 10:16:23 +08:00
zhangqiang 92d85c4200 【神将升级】 升星未卡住 and 神将合成报错 2020-11-10 10:16:01 +08:00
zhangqiang 6a1693939c 【觉醒】 觉醒添加图鉴 2020-11-09 20:05:51 +08:00
zhangqiang 85b21b27f0 Merge branch 'master_xma_local' into 0功能/神将觉醒 2020-11-09 18:04:54 +08:00
zhangqiang c4a466637f 【神将升级】 太快优化 2020-11-09 16:29:06 +08:00
zhangqiang f94c84f1cd 【觉醒】 增加觉醒页签 2020-11-09 15:04:48 +08:00
zhangqiang de677bee2f 【觉醒】增加脚本 2020-11-09 11:13:53 +08:00
zhangqiang 5c73587f89 Merge branch 'master_xma_local' into 0功能/神将觉醒
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2020-11-09 10:16:16 +08:00
jiaoyangna f26214ac58 清楚红点提交 2020-11-07 17:23:10 +08:00
jiaoyangna bc097708e9 不满足进阶条件,显示红点 2020-11-07 16:41:25 +08:00