Commit Graph

6 Commits (d5c6d690b0c01d452595be81af52b4f96e5583d6)

Author SHA1 Message Date
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
ZhangBiao d762af1660 【建木神树】神应属性界面 2020-12-11 16:03:27 +08:00
jiaoyangna 26c6fa1894 [四灵试炼] 预设代码提交 2020-12-10 16:23:13 +08:00
jiaoyangna 8b7a227a54 【四灵试炼】预设提交 2020-12-08 17:01:53 +08:00
ZhangBiao b516a8c202 【易经宝库】没有QA 无法购买 2020-11-06 13:36:48 +08:00
ZhangBiao 6f75850ae4 【易经宝库】提交 2020-11-05 19:10:20 +08:00