miduo_client/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View
jiaoyangna c4a0cab9a8 Merge branch '0功能/建木神树' into 0功能/silingshilian
# Conflicts:
#	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/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2020-12-21 10:46:53 +08:00
..
GeneralBigPopup_FourElementHelpFight.lua [四灵试炼] 预设代码提交 2020-12-10 16:23:13 +08:00
GeneralBigPopup_FourElementHelpFight.lua.meta 【四灵试炼】预设提交 2020-12-08 17:01:53 +08:00
GeneralBigPopup_ShenYingShuXing.lua 【建木神树】提交 2020-12-15 17:27:16 +08:00
GeneralBigPopup_ShenYingShuXing.lua.meta 【建木神树】神应属性界面 2020-12-11 16:03:27 +08:00
GeneralBigPopup_YiJingBaoKu.lua 【易经宝库】最终奖励选择bug修复 2020-11-09 13:47:37 +08:00
GeneralBigPopup_YiJingBaoKu.lua.meta 【易经宝库】提交 2020-11-05 19:10:20 +08:00
GeneralBigPopup_YiJingBaoKuRewardPreview.lua 【易经宝库】全部领完后 切换最终奖励点击奖池预览报错修复 2020-11-09 16:02:34 +08:00
GeneralBigPopup_YiJingBaoKuRewardPreview.lua.meta 【易经宝库】没有QA 无法购买 2020-11-06 13:36:48 +08:00