4023 Commits

Author SHA1 Message Date
Fang
667e9dbe11 更换皮肤卡面变化 2023-08-30 17:32:14 +08:00
Fang
71fe08b57c 更表 2023-08-30 17:04:14 +08:00
Fang
cb1331708c 资源导入 2023-08-30 17:02:30 +08:00
xiekaidong
d6046b2e7d Merge branch 'master' into dev_20230919 2023-08-30 09:19:48 +08:00
xiekaidong
b188be5dd4 提升版本号 v.1.2.5_android v.1.3.5_ios 2023-08-29 21:42:21 +08:00
xiekaidong
f08af571e2 Merge branch 'dev_20230829' 2023-08-29 21:41:35 +08:00
xiekaidong
b3b9e59f4a 优化 2023-08-29 21:32:29 +08:00
xiekaidong
cd1cea12fa bug修复 2023-08-29 21:04:37 +08:00
xiekaidong
27d17254a7 Merge branch 'master' into dev_20230919 2023-08-29 19:41:13 +08:00
xiekaidong
3a690240f9 首领入侵活动界面 2023-08-29 19:03:40 +08:00
xiekaidong
1dbe2391dc 提升版本号 v.1.2.4_android v.1.3.4_ios 2023-08-29 17:17:25 +08:00
Fang
79f1369068 加载资源优化 2023-08-29 17:11:49 +08:00
xiekaidong
1daeabac42 编译lua 2023-08-29 16:03:47 +08:00
xiekaidong
eb1a197cc0 Merge branch 'master' into dev_20230829
# Conflicts:
#	Assets/lua/app/config/skill_rogue.lua.bytes
#	Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes
2023-08-29 16:02:44 +08:00
xiekaidong
4e0cd6c8d8 更新资源 2023-08-29 14:57:22 +08:00
xiekaidong
67a46e7d06 增加容错 2023-08-29 14:55:13 +08:00
xiekaidong
f2b6ce6233 资源异常处理 2023-08-29 12:32:13 +08:00
xiekaidong
44d66bb6c2 资源检查 2023-08-29 12:23:18 +08:00
xiekaidong
df29ad47ea 更新配置 2023-08-29 12:22:26 +08:00
xiekaidong
3c50b60ccd 珊瑚特效 2023-08-29 11:27:04 +08:00
xiekaidong
2ac1249b99 更新协议 2023-08-29 11:03:54 +08:00
xiekaidong
a8a49eeb86 网络模块优化 2023-08-29 11:02:11 +08:00
xiekaidong
a6665b8fc3 bug修复 2023-08-28 19:15:19 +08:00
xiekaidong
7722e968e3 逻辑调整 2023-08-28 19:12:19 +08:00
xiekaidong
66bf185bd7 每日任务宝箱动画 2023-08-28 18:56:35 +08:00
xiekaidong
6533c64892 Merge branch 'dev_20230829' of http://git.juzugame.com/b6-client/b6-unity into dev_20230829 2023-08-28 18:36:19 +08:00
xiekaidong
b5c144a98e 显示修复 2023-08-28 18:36:15 +08:00
Fang
ec67afe68b 竞技场入口红点添加段位奖励可领取情况 2023-08-28 18:19:26 +08:00
Fang
c1af1c8dcf 段位奖励第一个档位标签显示fix 2023-08-28 17:51:20 +08:00
Fang
eeae9e8382 段位奖励添加奖励光效 2023-08-28 17:42:13 +08:00
Fang
7f99b9d771 装备礼包fix 2023-08-28 15:26:21 +08:00
xiekaidong
dccabf26e2 bug修复 2023-08-28 15:16:30 +08:00
xiekaidong
ed5e2f1dc7 xlua 2023-08-28 15:07:57 +08:00
xiekaidong
f470bacdbb 调整一下填充和格子效果的逻辑顺序 2023-08-28 14:50:44 +08:00
xiekaidong
5d690de886 封号删除账号 2023-08-28 14:13:04 +08:00
xiekaidong
8bcf0d01e2 封号功能和屏蔽一些网络冗余操作 2023-08-28 14:04:56 +08:00
xiekaidong
c7b4a4a064 bug修复 2023-08-28 11:12:32 +08:00
Fang
efd26331b4 档位奖励进度显示fix 2023-08-28 10:15:37 +08:00
7a34de2a39 Merge branch 'dev_20230829' of http://git.juzugame.com/b6-client/b6-unity into dev_20230829 2023-08-28 09:42:39 +08:00
456deab80a 11 2023-08-28 09:42:26 +08:00
Fang
b460d9d8c5 段位奖励段位图标显示修改 2023-08-25 10:36:35 +08:00
xiekaidong
c180b32e81 动画 2023-08-24 18:29:57 +08:00
xiekaidong
5bffd844c1 Merge branch 'dev_20230829' of http://git.juzugame.com/b6-client/b6-unity into dev_20230829 2023-08-24 18:26:12 +08:00
xiekaidong
0ec05b592c 更改基金开启时间 2023-08-24 18:26:03 +08:00
陈希
ca7f897efe Merge branch 'fang/装备礼包' into 'dev_20230829'
装备升级礼包

See merge request b6-client/b6-unity!15
2023-08-24 10:24:23 +00:00
Fang
2b11c3a6b0 定时器处理 2023-08-24 18:21:22 +08:00
Fang
be98aa91d8 段位奖励展示修改、添加收集标签红点 2023-08-24 18:09:55 +08:00
Fang
6097fc7c7f 装备升级礼包 2023-08-24 17:29:22 +08:00
xiekaidong
8cef52f549 Merge branch 'dev_20230919' into sdk_2 2023-08-24 15:48:02 +08:00
xiekaidong
7b7ee7aa0c 容错 2023-08-24 14:30:53 +08:00