Commit Graph

8162 Commits (868eb69aa6bf9be5ff0feb0b4b0c2edcc56c12a9)

Author SHA1 Message Date
yuanshuai 868eb69aa6 挑战副本bug修改 2022-04-25 19:33:11 +08:00
yuanshuai fd6f30e459 挑战副本bug修改 2022-04-25 18:56:48 +08:00
yuanshuai 626a2a98ef 化身bug修改 2022-04-25 18:48:27 +08:00
yuanshuai 565d4007df 化身之力界面调整 2022-04-25 18:42:19 +08:00
yuanshuai 55833325bf 跨服相关修改 2022-04-25 17:57:31 +08:00
yuanshuai 21342783bd 化身卡界面修改 2022-04-25 16:23:41 +08:00
yuanshuai 7c543952e5 身外化身界面修改 2022-04-25 15:52:46 +08:00
yuanshuai 4e5ccff820 身外化身界面调整 2022-04-25 14:42:17 +08:00
wangzhenxing e0263ea164 添加神印笔跳转 2022-04-25 13:43:46 +08:00
yuanshuai dcf1e29c3a 界面优化 2022-04-25 11:52:09 +08:00
wangzhenxing 4b9d210499 屏蔽神阵营,屏蔽招募 2022-04-25 11:31:32 +08:00
yuanshuai 160d974cbc 变身卡界面调整提交 2022-04-24 22:13:28 +08:00
wangzhenxing aad7541dbd 挑战副本不显示倒计时 2022-04-24 21:31:49 +08:00
yuanshuai 9ec3724c5d 身外化身界面调整 2022-04-24 20:27:05 +08:00
yuanshuai 882f77e164 界面修改 2022-04-24 19:46:59 +08:00
wangzhenxing 4792186f71 天书密卷屏蔽 装备篇 2022-04-24 18:32:44 +08:00
wangzhenxing 4fb96bca23 结算界面特效穿透问题修改 2022-04-24 18:27:53 +08:00
wangzhenxing 043f174f08 神印开始条件显示 2022-04-24 17:19:34 +08:00
yuanshuai 26970aee68 身外化身功能提交 2022-04-24 16:50:24 +08:00
wangzhenxing e498661919 神印添加背包分解 2022-04-24 16:36:27 +08:00
wangzhenxing 7cdf302e90 神印修改提交 2022-04-24 14:20:11 +08:00
wangzhenxing fed9afed62 [战斗]======目标选择逻辑添加空判断 2022-04-24 11:38:41 +08:00
yuanshuai 1114c62c97 添加一键放入 2022-04-22 19:29:10 +08:00
yuanshuai 765134f4b3 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationManager.lua
2022-04-22 18:33:04 +08:00
yuanshuai c3919b7e82 变身卡强化相关代码提交 2022-04-22 18:24:33 +08:00
wangzhenxing ca2b699259 神印提交 2022-04-22 18:23:01 +08:00
wangzhenxing e025824de6 添加报错处理 2022-04-22 13:17:58 +08:00
yuanshuai d247989586 挑战副本bug修改 2022-04-21 18:43:24 +08:00
wangzhenxing 61a52f4239 [变身卡]=======处理变身卡报错 2022-04-21 17:23:57 +08:00
yuanshuai dc8704a806 探索商店跳转入口添加 2022-04-28 10:48:08 +08:00
yuanshuai bf52645eb7 挑战副本优化 2022-04-25 18:20:53 +08:00
yuanshuai 5217d75b41 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-04-20 13:23:25 +08:00
yuanshuai 50683260c7 挑战副本红点提交 2022-04-20 13:23:08 +08:00
wangzhenxing ba45227ed1 [战斗]======去掉log 2022-04-20 13:22:26 +08:00
wangzhenxing 0cad07009a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-04-19 17:24:53 +08:00
wangzhenxing 53e7c44e2a [战斗]=======战斗提交 2022-04-19 17:23:37 +08:00
yuanshuai 804b2c3f4d 挑战副本bug修改 2022-04-19 16:50:03 +08:00
yuanshuai 3c72cd688b 挑战副本bug修改 2022-04-19 16:14:55 +08:00
yuanshuai 24bf6c63e4 挑战副本脚本修改 2022-04-19 15:52:50 +08:00
yuanshuai b907383826 挑战副本脚本修改 2022-04-19 11:53:08 +08:00
yuanshuai b4a626d9e2 挑战副本脚本修改提交 2022-04-18 18:48:06 +08:00
yuanshuai f8f14d06e9 挑战副本修改 2022-04-18 00:03:41 +08:00
yuanshuai bd3bed7e41 挑战副本脚本提交 2022-04-15 11:48:52 +08:00
yuanshuai 9ebdab46b3 挑战副本相关脚本提交 2022-04-14 16:07:45 +08:00
wangzhenxing 2ed317bc2c 摘星阁修改,备战阵营图标显示修改 2022-04-07 15:09:04 +08:00
wangzhenxing 5afe0f400b 洞府装备加成显示修改 2022-04-07 11:45:51 +08:00
wangzhenxing abd83b945a 【bug】======英雄升星属性显示修改 2022-04-07 10:33:55 +08:00
wangzhenxing 9d772eab4c 【bug】=====心魔助战英雄修改 2022-04-06 16:21:34 +08:00
wangzhenxing 50c78ef888 【bug】======转换职业后卸下魂宝 2022-04-06 14:15:36 +08:00
wangzhenxing e0ec7f2dec [bug]====英雄信息修改 2022-04-02 17:47:30 +08:00