Commit Graph

12623 Commits (d194a2d0c11c8062e55fd15215eda083c69d7b58)
 

Author SHA1 Message Date
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 ebf73ca029 神印预设提交 2022-04-22 18:01:00 +08:00
luyao 6238708fee 探索商店,挑战商店 文字上传 2022-04-22 17:37:45 +08:00
luyao 3adb7d0558 聊天界面优化(更换背景图,对话文字颜色更改、聊天底框更改 ) 2022-04-22 16:33:44 +08:00
luyao 4cee830a53 新图标、UI资源、meta文件上传 2022-04-22 16:29:09 +08:00
luyao f620d95f5e 【tips背板】修改提交 2022-04-22 15:49:52 +08:00
luyao 3526f91c3e 数字(0、100)中文字上传 2022-04-22 14:53:16 +08:00
wangzhenxing df42d22d4c 公用背景预设修改提交 2022-04-22 14:07:30 +08:00
wangzhenxing e025824de6 添加报错处理 2022-04-22 13:17:58 +08:00
wangzhenxing e4de85a120 tips背景修改,公用弹窗背景显示修改 2022-04-22 13:09:45 +08:00
luyao 6a7b4263a7 聊天底图(变浅色) 2022-04-22 12:45:03 +08:00
luyao 9e97f77090 聊天衬底图更新 2022-04-22 12:43:29 +08:00
luyao 582035b920 新排行榜资源(滑动条2个,标题衬底,分割线,排名衬底,奖励分割线) 2022-04-22 11:05:25 +08:00
luyao 8d3062083f 聊天功能,更换背景图 2022-04-22 10:05:57 +08:00
yuanshuai d247989586 挑战副本bug修改 2022-04-21 18:43:24 +08:00
luyao a307674de8 新按钮 已完成状态 2022-04-21 18:32:25 +08:00
luyao 8fe5b43449 新 按钮(前往、可领取、已完成) 2022-04-21 18:21:08 +08:00
luyao 4f28a4d4c3 tips界面更换背板 文字配色 2022-04-21 18:03:38 +08:00
wangzhenxing 61a52f4239 [变身卡]=======处理变身卡报错 2022-04-21 17:23:57 +08:00
luyao cb3576eb58 新底板拆分 2022-04-21 14:27:03 +08:00
luyao 023ba719d4 tips弹窗资源 2022-04-21 14:14:19 +08:00
wangzhenxing 9999138d97 [资源]=======新提示背景框提交 2022-04-21 13:41:59 +08:00
luyao 7ef0eac7f1 变身卡 【变】字角标(规格同阵营元素图标) 2022-04-21 11:22:12 +08:00
luyao 47e8205e8a 回合挑战、伤害挑战 标题
挑战副本标题
2022-04-21 11:18:03 +08:00
luyao d99e434172 2022年新图标(魂印、法宝、神印、装备) 2022-04-21 11:13:29 +08:00
luyao 15672af59a 回合挑战、伤害挑战图标(各2个,选中,未选中状态) 2022-04-21 11:11:54 +08:00
yuanshuai dc8704a806 探索商店跳转入口添加 2022-04-28 10:48:08 +08:00
luyao 9a209c865b 化身石、化身之力 图标上传 2022-04-20 20:58:26 +08:00
yuanshuai bf52645eb7 挑战副本优化 2022-04-25 18:20:53 +08:00
wangzhenxing f49bb38f8f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-04-20 16:20:41 +08:00
wangzhenxing 3021107155 globaldefine提交 2022-04-20 16:20:24 +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 c5b0d30f9c 资源提交 2022-04-19 13:39:48 +08:00
yuanshuai b907383826 挑战副本脚本修改 2022-04-19 11:53:08 +08:00