Commit Graph

91 Commits (3cde5c1cbd2d7d37537b5f9addf15a2bbecbb150)

Author SHA1 Message Date
ZhangBiao 205200268d 【主角修为】提交 2021-10-21 10:58:09 +08:00
wangzhenxing a17242b0c0 Merge branch 'china/dev' into 0功能/玉虚论道
Conflicts:
	Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab
	Assets/ManagedResources/~Lua/Data/ConfigData.lua
	Assets/ManagedResources/~Lua/Data/UIData.lua
	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
	Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
	Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua
2021-10-20 22:13:29 +08:00
wangzhenxing 24f0812b9f 主角技能提交 2021-10-20 21:33:37 +08:00
ZhangBiao 65c676eda9 【主角修为】文字调整 2021-10-20 15:11:41 +08:00
ZhangBiao 0d8af528ff 【主角修为】引导提交 2021-10-20 15:09:59 +08:00
ZhangBiao 76cfad3419 【主角修为】完成提交 2021-10-20 13:15:31 +08:00
ZhangBiao a387432369 【主角修为】提交 2021-10-19 18:34:10 +08:00
ZhangBiao 2d982e67d3 【主角修为】提交 2021-10-19 15:34:43 +08:00
wangzhenxing b5f27a64af 主角技能提交 2021-10-19 10:00:34 +08:00
skuld 854f2df748 【四灵试炼】增加一行文字 2021-11-02 02:46:08 +08:00
ZhangBiao 5af10faa57 【七界试炼】提交 2021-09-23 19:23:27 +08:00
yuanshuai bdeade9d71 【四象心法】点击消耗道具显示详情 2021-09-22 20:08:43 +08:00
yuanshuai 0d6e6908b9 【四象心法】bug修改 2021-09-11 17:59:27 +08:00
yuanshuai a89d168e50 【四象心法】功能完善 2021-09-10 14:37:47 +08:00
yuanshuai 1327abb290 四象心法修改 2021-09-10 11:22:08 +08:00
yuanshuai 4c66f50e66 Merge branch 'china/dev' into 0功能/四象心法
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua
2021-09-10 09:38:55 +08:00
yuanshuai 247ad9fdc7 【四象心法提交】 2021-09-09 20:45:12 +08:00
jiaoyangna 68ed8e3b40 位置修改 2021-09-02 11:42:43 +08:00
jiaoyangna 264328e859 适配修改 2021-09-02 11:38:49 +08:00
jiaoyangna 1744845cba 建木神树转移到修行 2021-09-01 11:57:15 +08:00
zhangqiang 0598fe8bdf 【修行特效】 2021-06-10 13:45:23 +08:00
ZhangBiao 45602214d8 【修行】特效增加 2021-05-27 17:57:49 +08:00
ZhangBiao 6f27423920 【修行】提交 2021-05-24 14:58:00 +08:00
ZhangBiao 04140ca1f2 【修行】神印按钮条件 2021-05-24 13:48:07 +08:00
ZhangBiao 70729ca2d0 【修行】增加红点 2021-05-24 11:21:56 +08:00
ZhangBiao 165ad7a2de 【修行】提交 2021-05-22 18:20:07 +08:00
ZhangBiao 7f19809419 【修行】提交 2021-05-20 20:12:01 +08:00
ZhangBiao b1e7cd1164 【修行】提交 2021-05-20 17:37:56 +08:00
ZhangBiao ae10b715cd 【修行】神印界面提交 2021-05-20 11:57:27 +08:00
ZhangBiao 40cafcca32 【修行】神印界面结构修改 2021-05-20 11:18:42 +08:00
ZhangBiao 5ea5e5b689 【修行】紫府神印界面添加资源 2021-05-20 10:55:33 +08:00
ZhangBiao e491f58adc 【修行】提交 2021-05-19 16:14:09 +08:00
ZhangBiao d2e6f593be 【修行】小点提交 2021-05-19 14:46:51 +08:00
ZhangBiao 916f5af5c8 【修行】资源调整 2021-05-19 10:23:39 +08:00
ZhangBiao 3229d0693b 【修行】提交 2021-05-14 13:21:38 +08:00
ZhangBiao 8df2338780 【修行】提交 2021-05-13 17:37:47 +08:00
ZhangBiao b6854deccd 【修行】协议提交 2021-05-12 18:47:47 +08:00
ZhangBiao d5799c1030 【修行】神印界面提交 2021-05-12 18:24:50 +08:00
ZhangBiao 7d63d1e191 【修行】提交 2021-05-12 17:40:38 +08:00
ZhangBiao 7ba5209394 【修行】提交 2021-05-11 17:23:19 +08:00
ZhangBiao 7104d77d7e 【修行】开坑 2021-05-11 15:09:25 +08:00