puxuan
|
8913c7fc88
|
设置
|
2025-08-08 17:14:39 +08:00 |
|
puxuan
|
2c8a5f70e5
|
res
|
2025-08-08 14:19:46 +08:00 |
|
puxuan
|
dd1063d61e
|
task
|
2025-08-06 20:46:47 +08:00 |
|
puxuan
|
4ce72abeb5
|
res
|
2025-08-04 18:49:43 +08:00 |
|
puxuan
|
2080d5d643
|
挂机
|
2025-07-28 20:37:09 +08:00 |
|
puxuan
|
7db28b8e49
|
arena
|
2025-07-21 21:05:32 +08:00 |
|
kai
|
4fb30c128d
|
每日挑战
|
2025-07-16 21:56:44 +08:00 |
|
kai
|
4429fb0e24
|
竞技场
|
2025-07-13 23:09:23 +08:00 |
|
kai
|
e1abcbf979
|
主界面
|
2025-07-07 23:37:57 +08:00 |
|
puxuan
|
b4c27e47f0
|
Merge branch 'dev_hero' into dev_chapter
# Conflicts:
# Assets/arts/atlas/ui/main.spriteatlas
# Assets/arts/textures/ui/main/main_bar_2_bg.png.meta
# Assets/arts/textures/ui/main/main_bg_4.png.meta
|
2025-07-04 12:56:52 +08:00 |
|
puxuan
|
a4c4632f98
|
res
|
2025-07-04 12:54:20 +08:00 |
|
puxuan
|
604b634b80
|
chapter
|
2025-07-03 20:56:56 +08:00 |
|
kai
|
4bd8a963ce
|
主界面
|
2025-06-29 13:38:53 +08:00 |
|
kai
|
f199aa4642
|
hero
|
2025-06-28 19:10:51 +08:00 |
|
puxuan
|
bab3c5b294
|
hero
|
2025-06-28 14:15:41 +08:00 |
|
puxuan
|
1d826dca2d
|
英雄界面
|
2025-06-26 21:34:10 +08:00 |
|
puxuan
|
5d042832ad
|
hero
|
2025-06-26 00:14:17 +08:00 |
|
puxuan
|
d1c1de9e75
|
res
|
2025-06-25 22:42:55 +08:00 |
|
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 |
|