185 Commits

Author SHA1 Message Date
xiekaidong
46818a52e9 技能解锁 2023-04-20 21:27:33 +08:00
xiekaidong
8e50d8a36a Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-20 21:27:05 +08:00
xiekaidong
caf9f121dc 技能解锁 2023-04-20 21:27:02 +08:00
chenxi
eac9e5753a tips 2023-04-20 21:09:11 +08:00
chenxi
b402578058 编译 2023-04-20 20:54:58 +08:00
xiekaidong
96cba83db9 动画调整 2023-04-20 20:30:56 +08:00
DESKTOP-5E92U9B\BigFoot
f1219289ab UI动画上传 2023-04-20 20:26:40 +08:00
xiekaidong
e341b1dd6b Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-20 19:57:07 +08:00
xiekaidong
983edfd36f 提交资源 2023-04-20 19:57:04 +08:00
chenxi
429adb121e ui 2023-04-20 19:25:40 +08:00
chenxi
c697b0da1a 伤害数字 2023-04-20 19:06:27 +08:00
chenxi
6991dd2d36 伤害 2023-04-20 19:04:56 +08:00
chenxi
0cd0ba2366 伤害 2023-04-20 19:04:18 +08:00
chenxi
4cb6be3bfc merge 2023-04-20 19:04:08 +08:00
chenxi
ab198df673 伤害数字 2023-04-20 18:59:28 +08:00
xiekaidong
c1119c5b9a 修复 2023-04-20 18:50:27 +08:00
xiekaidong
5222c799bb 动画 2023-04-20 18:46:11 +08:00
xiekaidong
af244ed017 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
# Conflicts:
#	Assets/prefabs/ui/battle/cell/grid_cell.prefab
2023-04-20 18:14:27 +08:00
xiekaidong
0a38b7137a 特效 2023-04-20 18:14:11 +08:00
chenxi
494852cadb toast 2023-04-20 18:08:11 +08:00
chenxi
18f974d5b8 主城箭头 2023-04-20 18:02:15 +08:00
chenxi
d9bbc06f81 先屏蔽sdk 2023-04-20 17:44:02 +08:00
chenxi
b4952deb67 屏蔽上报 2023-04-20 17:42:47 +08:00
chenxi
7db300f677 直接启动 2023-04-20 17:41:52 +08:00
chenxi
7672b6edc4 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-04-20 17:41:04 +08:00
chenxi
4b1ca125e0 随便 2023-04-20 17:40:58 +08:00
DESKTOP-5E92U9B\BigFoot
6aa7216dcf UI动画上传 2023-04-20 17:30:34 +08:00
chenxi
38d4878117 位置 2023-04-20 17:04:19 +08:00
xiekaidong
c6f97965bd Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-20 17:03:12 +08:00
xiekaidong
eb26827515 界面调整 2023-04-20 17:03:09 +08:00
chenxi
63d15c5c8f 调整节点位置 2023-04-20 16:55:10 +08:00
chenxi
6e18ed6563 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-04-20 16:34:33 +08:00
chenxi
e3692493e2 编译 2023-04-20 16:34:26 +08:00
DESKTOP-5E92U9B\BigFoot
7b6c2e2c46 UI动画上传 2023-04-20 16:19:48 +08:00
a554ebf395 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-20 15:27:17 +08:00
4cd0c31a2b 111 2023-04-20 15:27:06 +08:00
chenxi
830ace3d65 ui 2023-04-20 15:25:20 +08:00
chenxi
ff211bb284 更新资源 2023-04-20 15:23:43 +08:00
chenxi
779ae429f2 编译 2023-04-20 15:22:06 +08:00
xiekaidong
46f1c7e3ee Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-20 15:17:40 +08:00
xiekaidong
b33bd0894a rogue技能显示修改 2023-04-20 15:17:37 +08:00
b5e7911131 11111 2023-04-20 14:55:43 +08:00
chenxi
7d4b8d0589 更新配置 2023-04-20 12:08:52 +08:00
chenxi
32f7cbab3d 战斗ui 2023-04-20 12:07:02 +08:00
chenxi
24fe10437e 编译 2023-04-20 11:20:15 +08:00
chenxi
310fbd2102 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-04-20 11:16:33 +08:00
chenxi
456db2ec70 战斗ui 2023-04-20 11:16:30 +08:00
chenxi
f321791a71 更新资源 2023-04-20 11:16:09 +08:00
xiekaidong
942edff496 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-20 10:43:31 +08:00
xiekaidong
ba0d00407c 更新配置,优化一下检查棋盘的逻辑 2023-04-20 10:43:28 +08:00