xiekaidong
|
188a85d723
|
Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919
|
2023-09-18 16:04:06 +08:00 |
|
xiekaidong
|
9b95508c42
|
优化
|
2023-09-18 16:04:03 +08:00 |
|
Fang
|
448aa0659e
|
符文自动淬炼修改、特效完善
|
2023-09-18 14:57:00 +08:00 |
|
xiekaidong
|
c54a6c48b9
|
更新图集，编译lua
|
2023-09-18 14:53:41 +08:00 |
|
xiekaidong
|
b6345dce5a
|
Merge branch 'master' into dev_20230919
# Conflicts:
# Assets/arts/atlas/ui/common.asset
# Assets/arts/textures/ui/common/common_lock_1.png
# Assets/arts/textures/ui/common/common_lock_1.png.meta
# Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes
# Assets/lua/app/userdata/activity/act_boss_rush/act_boss_rush_data.lua.bytes
# Assets/lua/app/userdata/battle/battle_base_data.lua.bytes
|
2023-09-18 14:51:32 +08:00 |
|
xiekaidong
|
b0ca1e6132
|
循环活动的一些处理
|
2023-09-18 14:43:39 +08:00 |
|
xiekaidong
|
b044273afc
|
bug修复
|
2023-09-18 12:00:41 +08:00 |
|
xiekaidong
|
79c4fd7907
|
优化显示
|
2023-09-18 11:40:53 +08:00 |
|
xiekaidong
|
33e84e5cc1
|
优化显示
|
2023-09-18 11:21:37 +08:00 |
|
xiekaidong
|
c0aeccf71a
|
显示优化
|
2023-09-18 10:52:38 +08:00 |
|
xiekaidong
|
b3f490c9ac
|
bug修复
|
2023-09-18 10:38:18 +08:00 |
|
xiekaidong
|
ae1aeba1c5
|
编译lua
|
2023-09-18 09:39:22 +08:00 |
|
xiekaidong
|
1cf27e1a54
|
编译lua
|
2023-09-16 20:26:20 +08:00 |
|
Fang
|
0d50692a4f
|
请求优化
|
2023-09-15 20:54:35 +08:00 |
|
Fang
|
769cfbe34d
|
圆月活动
|
2023-09-15 19:23:25 +08:00 |
|
xiekaidong
|
cccce0625e
|
pvp战斗取消元素随机加权
|
2023-09-15 17:41:37 +08:00 |
|
xiekaidong
|
0ba16ffa0c
|
更新配置和优化显示
|
2023-09-15 17:37:15 +08:00 |
|
Fang
|
a86dbc2116
|
新用户报错fix
|
2023-09-14 12:05:04 +08:00 |
|
Fang
|
575a7a90f7
|
编译
|
2023-09-14 11:08:40 +08:00 |
|
Fang
|
2b78eb4cc0
|
显示fix
|
2023-09-14 11:08:09 +08:00 |
|
Fang
|
0679e04395
|
属性fix
|
2023-09-13 18:24:56 +08:00 |
|
Fang
|
9345d10d6c
|
符文属性加成修改
|
2023-09-13 17:59:30 +08:00 |
|
xiekaidong
|
96f2d2fae8
|
bug修复
|
2023-09-13 16:28:01 +08:00 |
|
xiekaidong
|
7f05bf4024
|
兼容处理
|
2023-09-13 15:53:14 +08:00 |
|
Fang
|
f409368faa
|
bug fix
|
2023-09-13 15:45:27 +08:00 |
|
xiekaidong
|
760e3878f4
|
bug修复
|
2023-09-13 15:34:58 +08:00 |
|
xiekaidong
|
75abb7d2bb
|
一些优化和审核模式处理
|
2023-09-13 14:56:25 +08:00 |
|
Fang
|
0a231c3f94
|
自动铸造开启等级
|
2023-09-13 11:03:18 +08:00 |
|
xiekaidong
|
96a0a976e6
|
优化
|
2023-09-13 09:43:41 +08:00 |
|
xiekaidong
|
4ef44130e9
|
优化和上传特效
|
2023-09-13 09:19:18 +08:00 |
|
xiekaidong
|
00e06273ad
|
优化
|
2023-09-12 20:34:37 +08:00 |
|
xiekaidong
|
bcf3982203
|
显示bug修复
|
2023-09-12 20:27:00 +08:00 |
|
xiekaidong
|
eaed3e859e
|
资源调整
|
2023-09-12 20:13:37 +08:00 |
|
xiekaidong
|
17a349c66d
|
优化点击
|
2023-09-12 20:12:12 +08:00 |
|
xiekaidong
|
2a8cfe31e9
|
点击优化
|
2023-09-12 20:10:19 +08:00 |
|
xiekaidong
|
ce6127b71d
|
显示优化
|
2023-09-12 20:08:08 +08:00 |
|
xiekaidong
|
9f0fd56ab4
|
修复bug
|
2023-09-12 19:46:47 +08:00 |
|
Fang
|
a6d3bb1803
|
bug fix
|
2023-09-12 18:44:00 +08:00 |
|
Fang
|
97ce41a1e3
|
更新配置
|
2023-09-12 18:11:58 +08:00 |
|
Fang
|
862e9200e7
|
容错
|
2023-09-12 17:59:54 +08:00 |
|
xiekaidong
|
6bfab0547f
|
bug修复
|
2023-09-12 16:32:07 +08:00 |
|
xiekaidong
|
f49e729db2
|
Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919
|
2023-09-12 16:22:29 +08:00 |
|
xiekaidong
|
27308ff7fd
|
bug修复
|
2023-09-12 16:22:26 +08:00 |
|
Fang
|
1e970493b3
|
优化
|
2023-09-12 16:17:22 +08:00 |
|
xiekaidong
|
e0e91933e8
|
编译lua
|
2023-09-12 16:04:33 +08:00 |
|
Fang
|
dc1b6c9838
|
显示fix
|
2023-09-12 15:27:50 +08:00 |
|
Fang
|
37bd501110
|
容错处理
|
2023-09-12 15:05:52 +08:00 |
|
陈希
|
4094f79f7b
|
Merge branch 'fang/runes' into 'dev_20230919'
符文功能
See merge request b6-client/b6-unity!17
|
2023-09-12 06:50:32 +00:00 |
|
xiekaidong
|
06f81a091a
|
Merge branch 'master' into dev_20230919
# Conflicts:
# Assets/lua/app/userdata/activity/fourteen_day/fourteen_day_data.lua.bytes
|
2023-09-12 14:41:48 +08:00 |
|
xiekaidong
|
34953bab97
|
回合数提示
|
2023-09-12 14:32:16 +08:00 |
|