2933 Commits

Author SHA1 Message Date
Fang
de30482954 礼包红点刷新fix 2023-09-06 16:54:20 +08:00
xiekaidong
581c9a8f6e 更新配置 2023-09-06 16:49:56 +08:00
xiekaidong
980d92839d 魅惑、免疫buff,被控状态下,技能cd不递减 2023-09-06 16:28:01 +08:00
chenxi
67dfdf94c6 打包工具完善 2023-09-06 15:28:10 +08:00
xiekaidong
5e469d538f 更新资源 2023-09-06 14:10:15 +08:00
xiekaidong
d3b124c536 Merge branch 'master' into dev_20230919 2023-09-06 10:20:38 +08:00
Fang
fd2c59552e 兑换红点修改 2023-09-06 10:16:30 +08:00
xiekaidong
5587b000e9 显示修复 2023-09-05 23:44:20 +08:00
chenxi
976a5d0e7c 更新 v.1.2.7_android v.1.3.7_ios 2023-09-05 22:29:46 +08:00
chenxi
82dbf388e5 编译 2023-09-05 22:29:20 +08:00
chenxi
7089eb2821 提升版本号 2023-09-05 22:27:59 +08:00
xiekaidong
e936d45746 设置abname 2023-09-05 20:55:51 +08:00
xiekaidong
eead0cc118 更新配置 2023-09-05 20:53:27 +08:00
xiekaidong
1ac93875aa 资源检查 2023-09-05 20:52:02 +08:00
xiekaidong
58c151899f 更新配置 2023-09-05 20:24:42 +08:00
xiekaidong
e8b7ee6f1e 更新配置 2023-09-05 20:23:01 +08:00
xiekaidong
32fd1db301 bug修复 2023-09-05 20:19:56 +08:00
xiekaidong
81d9203fed 皮肤问题修复 2023-09-05 19:59:02 +08:00
xiekaidong
20802d3bea 优化 2023-09-05 18:26:28 +08:00
xiekaidong
aa3f69a043 显示优化 2023-09-05 18:24:14 +08:00
xiekaidong
3d439234a4 更新配置 2023-09-05 18:00:45 +08:00
xiekaidong
ac9253f074 编译lua 2023-09-05 17:36:54 +08:00
xiekaidong
27be90073a buff数值上线 2023-09-05 17:15:27 +08:00
xiekaidong
4bc0e14cdf 等级修改 2023-09-05 15:32:34 +08:00
xiekaidong
ea75430a03 bug修复 2023-09-05 15:28:33 +08:00
xiekaidong
4dc5debc7c 优化 2023-09-05 12:02:00 +08:00
xiekaidong
0e962c43ff bug修复 2023-09-05 11:54:38 +08:00
xiekaidong
6f0a9720b2 bug修复和优化 2023-09-05 11:47:58 +08:00
xiekaidong
0d901aff71 bug修复 2023-09-05 10:48:55 +08:00
xiekaidong
68614b6ba8 bug修复 2023-09-05 10:06:59 +08:00
xiekaidong
cbf95861d6 bug修复 2023-09-05 10:00:11 +08:00
xiekaidong
d1d8b37743 字段名修复 2023-09-05 09:25:20 +08:00
xiekaidong
1cd3210514 bug修复 2023-09-04 20:21:33 +08:00
xiekaidong
df9fb7cabb bug修复 2023-09-04 20:06:58 +08:00
xiekaidong
284fbe9bc3 bug修复 2023-09-04 19:27:03 +08:00
xiekaidong
5666c71d2b 修复一些bug 2023-09-04 18:21:26 +08:00
xiekaidong
29f0e84ee0 14天丢图问题 2023-09-04 17:50:47 +08:00
xiekaidong
8089bc6e16 倒计时优化 2023-09-04 17:25:39 +08:00
xiekaidong
8c9945cc63 倒计时优化 2023-09-04 17:25:27 +08:00
xiekaidong
24b7793c44 bug修复 2023-09-04 16:55:13 +08:00
xiekaidong
072f845722 bug修复 2023-09-04 16:52:07 +08:00
xiekaidong
48c9e677c0 侧边栏 2023-09-04 16:48:24 +08:00
xiekaidong
ca627fc958 经验 2023-09-04 16:45:29 +08:00
xiekaidong
2bd4d0aece 跳转 2023-09-04 16:31:45 +08:00
xiekaidong
8ec159b939 侧边栏 2023-09-04 16:07:07 +08:00
xiekaidong
c15bf48f06 图集,资源修改 2023-09-04 09:46:55 +08:00
xiekaidong
e4aa6e2edd 更新配置 2023-09-01 21:21:02 +08:00
xiekaidong
f7fe141786 Merge branch 'dev_20230905' into boss_rush
# Conflicts:
#	Assets/arts/atlas/icon/item.asset
#	Assets/arts/atlas/ui/act_common.asset
#	Assets/arts/atlas/ui/act_common.asset.meta
#	Assets/arts/atlas/ui/act_common.spriteatlas
#	Assets/arts/atlas/ui/act_common.spriteatlas.meta
#	Assets/arts/atlas/ui/common.asset
#	Assets/arts/spines/ui/ui_act_boss_rush_pop.meta
#	Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop.atlas.txt.meta
#	Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop.png.meta
#	Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop.skel.bytes
#	Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop.skel.bytes.meta
#	Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop_atlas.asset
#	Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop_atlas.asset.meta
#	Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop_material.mat
#	Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop_material.mat.meta
#	Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop_skeletondata.asset
#	Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop_skeletondata.asset.meta
#	Assets/arts/textures/icon/item/51.png.meta
#	Assets/arts/textures/ui/act_common.meta
#	Assets/arts/textures/ui/act_common/act_common_3.png.meta
#	Assets/arts/textures/ui/act_common/act_common_bg_1.png.meta
#	Assets/arts/textures/ui/act_common/act_common_bg_2.png.meta
#	Assets/arts/textures/ui/act_common/act_common_bg_3.png.meta
#	Assets/arts/textures/ui/act_common/act_common_bg_4.png.meta
#	Assets/arts/textures/ui/act_common/act_common_bg_5.png.meta
#	Assets/arts/textures/ui/act_common/act_common_bg_6.png.meta
#	Assets/arts/textures/ui/act_common/act_common_board_1.png.meta
#	Assets/arts/textures/ui/act_common/act_common_board_2.png.meta
#	Assets/arts/textures/ui/act_common/act_common_board_3.png.meta
#	Assets/arts/textures/ui/act_common/act_common_board_4.png.meta
#	Assets/arts/textures/ui/act_common/act_common_board_5.png.meta
#	Assets/arts/textures/ui/act_common/act_common_dec_1.png.meta
#	Assets/arts/textures/ui/act_common/act_common_line_1.png.meta
#	Assets/arts/textures/ui/act_common/act_common_line_2.png.meta
#	Assets/arts/textures/ui/act_common/act_common_progress_1.png.meta
#	Assets/arts/textures/ui/act_common/act_common_progress_bg.png.meta
#	Assets/arts/textures/ui/act_common/act_common_select.png.meta
#	Assets/arts/textures/ui/act_common/act_fourteen_dec_1.png.meta
#	Assets/arts/textures/ui/act_common/act_fourteen_dec_2.png.meta
#	Assets/arts/textures/ui/common/common_board_126.png.meta
#	Assets/proto/protocol.bytes
2023-09-01 21:19:26 +08:00
xiekaidong
f0889cb678 首领公开赛 2023-09-01 21:10:25 +08:00
Fang
2877a0418f bug fix 2023-09-01 18:35:56 +08:00