Commit Graph

27 Commits (e764f74e6d364a10e1bb3d42e2301b9337539d25)

Author SHA1 Message Date
jiaoyangna 9681a00816 【ID1009395】
点将台增加剩余保底次数显示
2021-06-08 15:15:13 +08:00
jiaoyangna c22e26a5f5 Merge branch 'china/dev-c' into 0优化/无尽副本
# Conflicts:
#	Assets/ManagedResources/Atlas/FuXingGaoZhao/f_fuxinggaozhao_1888.png.meta
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Logic/GameEvent.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_Onhook.lua
2021-05-24 13:53:28 +08:00
jiaoyangna 30a6a41fe6 无尽副本修改提交 2021-05-21 16:39:08 +08:00
jiaoyangna d62b8b5011 无尽副本修改提交 2021-05-14 19:11:40 +08:00
ZhangBiao 87f18cb049 【修行】提交 2021-05-14 17:48:47 +08:00
ZhangBiao 8df2338780 【修行】提交 2021-05-13 17:37:47 +08:00
ZhangBiao b6854deccd 【修行】协议提交 2021-05-12 18:47:47 +08:00
zhangqiang de76c697c4 【英雄升星祭品】提交——01 2021-04-19 13:46:24 +08:00
ZhangBiao 685ace078a 【福星高照】增加协议 2021-03-30 18:50:15 +08:00
jiaoyangna c4883087a5 lua 提交 2021-02-22 16:35:25 +08:00
jiaoyangna fce9811a5b 协议提交 2021-02-22 10:39:34 +08:00
guowei 83316e4724 【鸿蒙阵协议】 2021-01-07 15:31:33 +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 30b0c26a6e 【鸿蒙阵】 2021-01-04 09:57:42 +08:00
guowei 4939dd69b8 【鸿蒙阵修改】 2020-12-28 20:02:36 +08:00
guowei d36276eb0c 【鸿蒙阵修改】 2020-12-26 15:07:51 +08:00
ZhangBiao 6945cbcacf 【森罗幻境】红点修改 2020-12-25 12:05:23 +08:00
guowei ef02f1b6e9 【鸿蒙阵更新】 2020-12-21 18:19:38 +08:00
guowei 4f4542d53a 【鸿蒙阵】 2020-12-18 13:39:35 +08:00
guowei 52d493ebc7 【鸿蒙阵】二次提交 2020-12-17 10:41:00 +08:00
zhangqiang 80c949c54d 【灵兽】 灵兽数据分页 2020-11-27 10:57:50 +08:00
jiaoyangna e92e63444b 皮肤提交 2020-11-03 17:27:32 +08:00
zhangqiang 058b18bc6f 最新表 协议数据 2020-08-12 18:29:11 +08:00
ZhangBiao c1c013a007 神将置换 基本功能完成 2020-08-11 20:55:05 +08:00
zhangqiang 0a37b3cb11 法宝回归协议提交 2020-08-07 12:41:35 +08:00
jiaoyangna 7f54e3c88a 装备提交 2020-07-06 20:35:39 +08:00
JieLing 4c8d2cf8de 提交 2020-05-09 13:31:21 +08:00