Commit Graph

14 Commits (b6640cc3708334f27b522b37b0322734a892856d)

Author SHA1 Message Date
jiaoyangna c1c15d6c8b 四灵试炼 2021-01-04 11:39:58 +08:00
jiaoyangna 6c9a8c7687 [四灵试炼] 预设提交 2020-12-21 13:43:04 +08:00
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 0b6c8362b6 【建木神树】提交 2020-12-15 17:27:16 +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 46b8e52524 【易经宝库】全部领完后 切换最终奖励点击奖池预览报错修复
(cherry picked from commit cfeabacca5df3645e1cf4f6e68558f15a3bfb025)
2020-11-09 16:02:34 +08:00
ZhangBiao c4745e8c7c 【易经宝库】最终奖励选择bug修复 2020-11-09 13:47:37 +08:00
ZhangBiao 9ca403ebff 【易经宝库】第三层抽取完成后bug修复 2020-11-09 11:09:42 +08:00
ZhangBiao b98490f233 【易经宝库】差一个稿子的动效 2020-11-06 15:11:19 +08:00
ZhangBiao b516a8c202 【易经宝库】没有QA 无法购买 2020-11-06 13:36:48 +08:00
ZhangBiao 6f75850ae4 【易经宝库】提交 2020-11-05 19:10:20 +08:00
ZhangBiao 476057bd1c 【易经宝库】主界面奖励显示 通用奖励界面创建 2020-11-04 19:51:58 +08:00