Commit Graph

78 Commits (a3c24ee4b790b020c0731a830a63fdf2b23e281e)

Author SHA1 Message Date
ZhangBiao 982137c9b7 【命格】提交 2021-12-10 14:14:08 +08:00
ZhangBiao 82c89e5e7d 【命格】提交 2021-12-10 13:57:24 +08:00
ZhangBiao 016780c7bc 【命格】命石替换 2021-12-08 14:17:18 +08:00
ZhangBiao 10ad308033 【命格】提交 2021-12-06 15:07:34 +08:00
ZhangBiao 23be95a314 【命格】提交 2021-12-06 14:24:24 +08:00
ZhangBiao 06d532a9bc 【命格】开坑 2021-12-06 14:06:23 +08:00
ZhangBiao b433178b6e 【修行】结构更改 2021-12-06 11:57:08 +08:00
jiaoyangna b6bcd50dd3 身外化身修改提交 2021-11-26 14:11:23 +08:00
jiaoyangna 4d887421ea 身外化身提交 2021-11-18 11:55:26 +08:00
jiaoyangna 1e4a7a57be 法宝之魂 提交 2021-11-16 15:24:17 +08:00
jiaoyangna e6f4e50656 法宝聚灵 2021-11-15 18:24:39 +08:00
ZhangBiao 6d483802fa 【修行】特效穿透修改
(cherry picked from commit ee7b2b9919)
2021-11-10 15:22:43 +08:00
wangzhenxing c494145ff8 主角技能添加屏蔽 2021-10-22 10:21:07 +08:00
wangzhenxing ae47df29bb 【红点】=============修行技能红点提交 2021-10-22 10:08:53 +08:00
wangzhenxing bb849d4b93 主角技能界面修改 2021-10-21 11:58:33 +08:00
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 76cfad3419 【主角修为】完成提交 2021-10-20 13:15:31 +08:00
ZhangBiao 2d982e67d3 【主角修为】提交 2021-10-19 15:34:43 +08:00
wangzhenxing b5f27a64af 主角技能提交 2021-10-19 10:00:34 +08:00
yuanshuai db18313495 Merge branch '0功能/四象心法' into china/dev
# Conflicts:
#	Assets/ManagedResources/EffectResUI/XunBaoMiZong.meta
#	Assets/ManagedResources/Icon/Item/r_yjsp.png.meta
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	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/ActivityProto.proto
#	Assets/ManagedResources/~Lua/Message/ArenaInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/ChatProto.proto
#	Assets/ManagedResources/~Lua/Message/CommonProto.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/GeneralPanel/GeneralInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2021-09-22 15:12:32 +08:00
jiaoyangna 6c5552524b 报错修改
(cherry picked from commit 80e81f9f9b)
2021-09-16 17:16:25 +08:00
jiaoyangna 8293c56b37 建木神树图片修改提交
(cherry picked from commit f127a0e858)
2021-09-16 17:11:29 +08:00
yuanshuai f0da745b6c bug修改 2021-09-13 19:00:53 +08:00
yuanshuai 4aa823fb3c 【四象心法】bug修改 2021-09-13 18:40:38 +08:00
yuanshuai b25468cd26 四象心法bug 修改 2021-09-13 17:18:32 +08:00
yuanshuai e91140175f 四象心法添加通用等级限制 2021-09-10 15:44:32 +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 4f266a20b9 红点问题修改提交 2021-09-01 14:17:21 +08:00
jiaoyangna 1744845cba 建木神树转移到修行 2021-09-01 11:57:15 +08:00
Zhang Biao a7350e7f53 【修行】测试提交 2021-08-21 16:17:29 +08:00
ZhangBiao 53567ea586 【Log】清除带颜色的Log 2021-07-01 16:33:40 +08:00
zhangqiang 3506d2bb2c 【页签图标替换】局部 + 修行提示文字修改 2021-06-10 16:33:43 +08:00
zhangqiang 18950a2326 【山河社稷图】章节图标修改 2021-06-10 14:43:45 +08:00
zhangqiang 0598fe8bdf 【修行特效】 2021-06-10 13:45:23 +08:00
ZhangBiao 9f586818c2 【修行】特效问题提交 2021-06-01 16:39:09 +08:00
ZhangBiao c98aa8c703 【修行】增加属性提升提示 2021-06-01 13:54:21 +08:00
ZhangBiao 749184a59a 【修行】提交 2021-05-29 19:22:35 +08:00
ZhangBiao 2fbbc6a52a 【修行】层级问题解决 2021-05-29 18:17:41 +08:00
ZhangBiao 45602214d8 【修行】特效增加 2021-05-27 17:57:49 +08:00
ZhangBiao 5ce0867bd2 【修行】修行玩法里提升战力,排行榜战力刷新不及时 2021-05-27 09:28:10 +08:00
ZhangBiao f3cf294f42 【主界面】右上伸缩条首充引导调整,修行调整 2021-05-26 10:16:24 +08:00
ZhangBiao 8d4d1aa777 【修行】第二短引导 2021-05-25 20:39:37 +08:00
ZhangBiao d00e5f99a7 【修行】神印界面调整 2021-05-25 14:59:59 +08:00
ZhangBiao fa051b65dc 【修行】QA增加 2021-05-24 13:58:30 +08:00
ZhangBiao 04140ca1f2 【修行】神印按钮条件 2021-05-24 13:48:07 +08:00
ZhangBiao dade783281 【修行】英雄选择界面修改 2021-05-24 11:53:44 +08:00
ZhangBiao 040f83f370 【修行】红点调整 2021-05-24 11:34:50 +08:00