puxuan
|
43222b0299
|
主界面
|
2025-05-13 00:12:08 +08:00 |
|
kai
|
986b121df4
|
升级引擎
|
2025-04-30 23:12:28 +08:00 |
|
xiekaidong
|
16d550aefa
|
设置abname
|
2023-10-09 16:01:10 +08:00 |
|
Fang
|
e1a49e73d9
|
波次锦标赛
|
2023-09-27 18:54:16 +08:00 |
|
xiekaidong
|
00e53beccd
|
设置abname
|
2023-09-20 17:44:40 +08:00 |
|
xiekaidong
|
c710842d63
|
资源修复
|
2023-09-19 19:41:44 +08:00 |
|
xiekaidong
|
70c822b986
|
更新资源
|
2023-09-19 18:36:21 +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
|
83a5666725
|
Merge branch 'dev_20230919' into limit_pvp
# Conflicts:
# Assets/arts/atlas/ui/act_common.asset
# Assets/arts/atlas/ui/act_common.spriteatlas
# Assets/arts/atlas/ui/common.asset
# Assets/arts/atlas/ui/common.spriteatlas
# Assets/proto/protocol.bytes
|
2023-09-16 17:56:32 +08:00 |
|
xiekaidong
|
bcb9e60c73
|
界面调整
|
2023-09-15 21:00:29 +08:00 |
|
xiekaidong
|
e528334190
|
界面处理
|
2023-09-15 20:46:35 +08:00 |
|
Fang
|
769cfbe34d
|
圆月活动
|
2023-09-15 19:23:25 +08:00 |
|
xiekaidong
|
bd58628e2d
|
更新资源
|
2023-09-12 14:41:23 +08:00 |
|
Fang
|
6eeff31530
|
符文功能
|
2023-09-12 10:41:44 +08:00 |
|
xiekaidong
|
4da792de57
|
更新资源
|
2023-09-09 16:13:44 +08:00 |
|
xiekaidong
|
2dd0c48961
|
界面和资源
|
2023-09-07 15:21:53 +08:00 |
|
xiekaidong
|
d83509fc3f
|
资源处理
|
2023-09-06 18:47:40 +08:00 |
|
xiekaidong
|
e936d45746
|
设置abname
|
2023-09-05 20:55:51 +08:00 |
|
xiekaidong
|
81d7dc4bd0
|
资源和界面
|
2023-08-31 17:05:18 +08:00 |
|
Fang
|
6097fc7c7f
|
装备升级礼包
|
2023-08-24 17:29:22 +08:00 |
|
Fang
|
7837455596
|
竞技场段位奖励
|
2023-08-23 14:41:56 +08:00 |
|
xiekaidong
|
44becf62dd
|
设置abName
|
2023-08-15 21:43:21 +08:00 |
|
Fang
|
302452e76d
|
竞技场宝箱弹出优化、bugfix
|
2023-08-11 15:50:38 +08:00 |
|
Fang
|
51891b4d27
|
夏日活动功能
|
2023-08-11 12:00:11 +08:00 |
|
Fang
|
9c9cde6a89
|
皮肤功能
|
2023-08-09 14:15:12 +08:00 |
|
xiekaidong
|
0cbb46e649
|
设置adName
|
2023-07-25 22:15:06 +08:00 |
|
Fang
|
6b52dc9f1d
|
支线基金
|
2023-07-24 11:54:43 +08:00 |
|
Fang
|
02da483630
|
装备升级材料获取
|
2023-07-21 09:51:28 +08:00 |
|
Fang
|
047f17e6f3
|
装备系统
|
2023-07-20 19:35:17 +08:00 |
|
Fang
|
2101a422bb
|
英雄图鉴
|
2023-07-14 17:08:08 +08:00 |
|
xiekaidong
|
84ae5c96c6
|
出包前得资源检查和设置abName
|
2023-07-07 16:04:44 +08:00 |
|
xiekaidong
|
83b8dbe82d
|
Merge branch 'dev' into arena
# Conflicts:
# Assets/arts/atlas/ui/common.spriteatlas
# Assets/lua/app/common/bi_report.lua.bytes
# Assets/lua/app/common/data_manager.lua.bytes
# Assets/lua/app/config/localization/localization_global_const.lua.bytes
# Assets/lua/app/config/strings/cn/global.lua.bytes
# Assets/lua/app/module/battle/controller/battle_controller.lua.bytes
# Assets/lua/app/module/chapter/chapter_manager.lua.bytes
# Assets/lua/app/proto/proto_msg_type.lua.bytes
# Assets/lua/app/ui/main_city/main_city_ui.lua.bytes
# Assets/lua/app/userdata/hero/hero_data.lua.bytes
# Assets/proto/protocol.bytes
|
2023-07-04 15:33:45 +08:00 |
|
xiekaidong
|
b7fb8bff59
|
评价弹窗
|
2023-07-03 15:57:42 +08:00 |
|
Fang
|
aae1ec0c8c
|
完善逻辑
|
2023-06-29 16:10:22 +08:00 |
|
Fang
|
764645f4d5
|
逻辑补充
|
2023-06-28 18:36:07 +08:00 |
|
Fang
|
80c02c4c82
|
竞技场
|
2023-06-27 18:27:38 +08:00 |
|
Fang
|
32364f7c4d
|
超框
|
2023-06-20 20:20:23 +08:00 |
|
chenxi
|
622d9918d3
|
ab name
|
2023-06-20 14:32:36 +08:00 |
|
Fang
|
d275c58ad4
|
头像昵称
|
2023-06-19 10:57:28 +08:00 |
|
chenxi
|
3791c54170
|
ab name
|
2023-06-16 21:55:12 +08:00 |
|
chenxi
|
e3d7fad227
|
公告
|
2023-06-16 15:11:05 +08:00 |
|
Fang
|
656f096c03
|
ui资源补充替换
|
2023-06-13 16:16:29 +08:00 |
|
xiekaidong
|
3e92da4286
|
界面处理
|
2023-06-13 10:20:17 +08:00 |
|
chenxi
|
d00eef7856
|
ab name
|
2023-06-05 21:33:26 +08:00 |
|
chenxi
|
83363f4694
|
主城资源
|
2023-06-05 19:54:50 +08:00 |
|
chenxi
|
d1ec620837
|
资源自动处理和ab name
|
2023-06-05 19:19:17 +08:00 |
|
chenxi
|
2f6f2861b8
|
金猪动画
|
2023-06-05 15:08:25 +08:00 |
|
Fang
|
4d914f84b0
|
每日挑战替图
|
2023-06-05 11:47:32 +08:00 |
|
CloudJ
|
4258abd474
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
# Conflicts:
# Assets/arts/atlas/ui/shop.asset
|
2023-06-05 10:58:33 +08:00 |
|
CloudJ
|
4d5ad2f87a
|
替换UI
|
2023-06-05 10:58:24 +08:00 |
|