xiekaidong
|
06d05d2fe8
|
更新资源
|
2023-09-22 10:11:51 +08:00 |
|
xiekaidong
|
00e53beccd
|
设置abname
|
2023-09-20 17:44:40 +08:00 |
|
xiekaidong
|
c429cb382b
|
替换资源
|
2023-09-20 16:04:28 +08:00 |
|
xiekaidong
|
ea95ca7f2c
|
替换资源
|
2023-09-20 15:20:02 +08:00 |
|
xiekaidong
|
71b7f13375
|
更新资源
|
2023-09-20 09:36:28 +08:00 |
|
xiekaidong
|
a071da067a
|
更新资源
|
2023-09-19 21:16:11 +08:00 |
|
xiekaidong
|
267d580dad
|
特效
|
2023-09-19 15:45:20 +08:00 |
|
xiekaidong
|
33e280187a
|
替换资源
|
2023-09-19 15:24:57 +08:00 |
|
xiekaidong
|
41434625e2
|
bug修复
|
2023-09-18 20:52:32 +08:00 |
|
xiekaidong
|
a2ff24f5a6
|
帮助界面
|
2023-09-18 20:22:02 +08:00 |
|
xiekaidong
|
c30e9d729c
|
优化和容错
|
2023-09-18 20:07:37 +08:00 |
|
xiekaidong
|
a5e8643589
|
图片设置
|
2023-09-18 19:45:53 +08:00 |
|
xiekaidong
|
56fbcd4a6e
|
更新资源
|
2023-09-18 17:06:17 +08:00 |
|
xiekaidong
|
9b95508c42
|
优化
|
2023-09-18 16:04:03 +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
|
79c4fd7907
|
优化显示
|
2023-09-18 11:40:53 +08:00 |
|
xiekaidong
|
c8ac729532
|
bug修复
|
2023-09-18 09:37:52 +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
|
78b27b7607
|
资源处理
|
2023-09-15 21:46:10 +08:00 |
|
xiekaidong
|
53caadd7e5
|
更新资源
|
2023-09-15 21:01:19 +08:00 |
|
xiekaidong
|
e528334190
|
界面处理
|
2023-09-15 20:46:35 +08:00 |
|
xiekaidong
|
1c44759790
|
资源
|
2023-09-15 17:27:22 +08:00 |
|
xiekaidong
|
00c9bd3bfe
|
还原资源
|
2023-09-13 10:46:12 +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
|
dbb30676a2
|
符文副本主界面
|
2023-09-07 19:15:01 +08:00 |
|
xiekaidong
|
2dd0c48961
|
界面和资源
|
2023-09-07 15:21:53 +08:00 |
|
xiekaidong
|
e936d45746
|
设置abname
|
2023-09-05 20:55:51 +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
|
9d6334e76e
|
新手14天乐
|
2023-09-01 15:35:31 +08:00 |
|
xiekaidong
|
81d7dc4bd0
|
资源和界面
|
2023-08-31 17:05:18 +08:00 |
|
Fang
|
6097fc7c7f
|
装备升级礼包
|
2023-08-24 17:29:22 +08:00 |
|
xiekaidong
|
d716440747
|
界面处理
|
2023-08-23 17:46:57 +08:00 |
|
xiekaidong
|
44becf62dd
|
设置abName
|
2023-08-15 21:43:21 +08:00 |
|
Fang
|
ea746f2851
|
导入武器图片
|
2023-08-15 10:41:35 +08:00 |
|
Fang
|
d88a18d48b
|
活动礼包弹出逻辑补充
|
2023-08-11 15:09:15 +08:00 |
|
Fang
|
51891b4d27
|
夏日活动功能
|
2023-08-11 12:00:11 +08:00 |
|
xiekaidong
|
4d8561a55f
|
更新资源
|
2023-08-08 17:59:29 +08:00 |
|
xiekaidong
|
ee6e367889
|
上传背景
|
2023-08-08 11:26:54 +08:00 |
|
xiekaidong
|
0cbb46e649
|
设置adName
|
2023-07-25 22:15:06 +08:00 |
|
xiekaidong
|
251ca6a3a7
|
资源调整
|
2023-07-25 21:07:10 +08:00 |
|
xiekaidong
|
e0e6ebfd4b
|
显示调整
|
2023-07-24 22:01:10 +08:00 |
|
Fang
|
704dac4fa7
|
礼包资源上传、bug_fix
|
2023-07-24 15:13:32 +08:00 |
|
xiekaidong
|
c61a2fb229
|
增加资源
|
2023-07-24 11:52:29 +08:00 |
|
chenxi
|
a063c83a48
|
上传资源
|
2023-07-23 18:42:20 +08:00 |
|
chenxi
|
4cff3d6cd2
|
更新资源
|
2023-07-23 18:35:09 +08:00 |
|
chenxi
|
431fad8874
|
武器资源
|
2023-07-23 15:45:47 +08:00 |
|
xiekaidong
|
7c9356cc91
|
更新资源
|
2023-07-22 13:57:41 +08:00 |
|