puxuan
|
a3771c610b
|
升级
|
2025-10-09 17:29:10 +08:00 |
|
tuxinyu
|
2ac928f6a2
|
11111111
|
2025-10-08 21:40:57 +08:00 |
|
puxuan
|
93065c8a00
|
Merge branch 'dev_act' into dev_hero_2
|
2025-10-08 18:20:22 +08:00 |
|
puxuan
|
d9cbbb3337
|
特权
|
2025-10-08 18:17:27 +08:00 |
|
tuxinyu
|
46b4b73cda
|
11111111
|
2025-10-08 17:01:57 +08:00 |
|
tuxinyu
|
92ff9e6393
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-10-08 16:56:02 +08:00 |
|
tuxinyu
|
1a89a7e49a
|
11111111
|
2025-10-08 16:54:57 +08:00 |
|
puxuan
|
743d0f097b
|
特权
|
2025-10-08 16:03:28 +08:00 |
|
changyuxiang
|
d161fac759
|
补充一个，改点东西
|
2025-10-08 14:07:54 +08:00 |
|
puxuan
|
b95a8b1378
|
hero
|
2025-10-08 10:55:47 +08:00 |
|
puxuan
|
4aa2e6f2a7
|
Merge branch 'dev_hero' into dev_act
# Conflicts:
# Assets/lua/app/config/buff.lua.bytes
# Assets/lua/app/config/fx.lua.bytes
# Assets/lua/app/config/skill.lua.bytes
# Assets/lua/app/config/strings/cn/attr.lua.bytes
# Assets/lua/app/config/strings/cn/task_type.lua.bytes
# Assets/lua/app/config/strings/de/attr.lua.bytes
# Assets/lua/app/config/strings/en/attr.lua.bytes
# Assets/lua/app/config/strings/en/task_type.lua.bytes
# Assets/lua/app/config/strings/es/attr.lua.bytes
# Assets/lua/app/config/strings/es/task_type.lua.bytes
# Assets/lua/app/config/strings/fr/attr.lua.bytes
# Assets/lua/app/config/strings/id/attr.lua.bytes
# Assets/lua/app/config/strings/id/task_type.lua.bytes
# Assets/lua/app/config/strings/ja/attr.lua.bytes
# Assets/lua/app/config/strings/ja/task_type.lua.bytes
# Assets/lua/app/config/strings/ko/attr.lua.bytes
# Assets/lua/app/config/strings/ko/task_type.lua.bytes
# Assets/lua/app/config/strings/pt/attr.lua.bytes
# Assets/lua/app/config/strings/pt/task_type.lua.bytes
# Assets/lua/app/config/strings/ru/attr.lua.bytes
# Assets/lua/app/config/strings/th/attr.lua.bytes
# Assets/lua/app/config/strings/th/task_type.lua.bytes
# Assets/lua/app/config/strings/vi/attr.lua.bytes
# Assets/lua/app/config/strings/vi/task_type.lua.bytes
# Assets/lua/app/config/strings/zh/attr.lua.bytes
# Assets/lua/app/config/strings/zh/task_type.lua.bytes
|
2025-10-07 18:30:51 +08:00 |
|
puxuan
|
614909a19f
|
每日挑战
|
2025-10-07 18:28:34 +08:00 |
|
puxuan
|
8060568ced
|
签到
|
2025-10-07 17:19:46 +08:00 |
|
puxuan
|
9c290fa178
|
活动
|
2025-10-07 11:21:54 +08:00 |
|
tuxinyu
|
5f4f6087d2
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-09-30 19:25:37 +08:00 |
|
tuxinyu
|
9858563402
|
111111
|
2025-09-30 19:25:26 +08:00 |
|
puxuan
|
c819d7ce8a
|
礼包
|
2025-09-29 21:10:50 +08:00 |
|
puxuan
|
2a6bdfd66e
|
Merge branch 'dev_hero' into dev_act
|
2025-09-29 17:38:08 +08:00 |
|
puxuan
|
23ac799d02
|
召唤
|
2025-09-29 17:33:25 +08:00 |
|
puxuan
|
d8249cc3ac
|
冲刺
|
2025-09-29 15:37:57 +08:00 |
|
puxuan
|
c3ce4f0615
|
Merge branch 'dev_hero' into dev_act
|
2025-09-28 20:36:36 +08:00 |
|
puxuan
|
f93e31fb95
|
活动
|
2025-09-28 20:05:55 +08:00 |
|
tuxinyu
|
20d555500d
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-09-28 19:47:01 +08:00 |
|
tuxinyu
|
58b59379d9
|
11111111
|
2025-09-28 19:46:52 +08:00 |
|
puxuan
|
dc4c1fc49e
|
活动
|
2025-09-28 16:11:00 +08:00 |
|
puxuan
|
6a5c903e48
|
fix bug
|
2025-09-26 16:48:34 +08:00 |
|
puxuan
|
4369ed4075
|
config
|
2025-09-26 15:42:14 +08:00 |
|
puxuan
|
d906155c9c
|
Merge branch 'dev_hero' into dev_act
|
2025-09-26 09:45:03 +08:00 |
|
puxuan
|
0ac2b10096
|
活动
|
2025-09-26 09:44:45 +08:00 |
|
puxuan
|
e91c3d797d
|
冲刺活动
|
2025-09-25 20:13:36 +08:00 |
|
tuxinyu
|
425ea3ec56
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-09-25 19:29:23 +08:00 |
|
tuxinyu
|
e3fc446960
|
1111111111
|
2025-09-25 19:29:07 +08:00 |
|
puxuan
|
38345d5909
|
Merge branch 'dev_hero' into dev_act
|
2025-09-25 16:41:07 +08:00 |
|
puxuan
|
776b6ae29f
|
结算界面
|
2025-09-25 16:40:26 +08:00 |
|
puxuan
|
1c5b577038
|
活动
|
2025-09-25 16:05:10 +08:00 |
|
puxuan
|
18296991a2
|
商业化
|
2025-09-25 11:41:03 +08:00 |
|
tuxinyu
|
d3e870351b
|
11111111
|
2025-09-24 21:14:35 +08:00 |
|
tuxinyu
|
cfed0a625f
|
111111111
|
2025-09-24 20:49:02 +08:00 |
|
tuxinyu
|
365ae2a618
|
11111111111
|
2025-09-24 19:44:36 +08:00 |
|
tuxinyu
|
d2ac016e74
|
11111111111
|
2025-09-24 19:39:24 +08:00 |
|
puxuan
|
08d3ed2d7e
|
商店
|
2025-09-24 16:23:21 +08:00 |
|
puxuan
|
aa3cd49667
|
Merge branch 'dev_hero' into dev_equip
# Conflicts:
# Assets/lua/app/ui/hero/hero_comp.lua.bytes
|
2025-09-24 11:06:41 +08:00 |
|
tuxinyu
|
a7d661556a
|
1111111
|
2025-09-23 21:22:43 +08:00 |
|
tuxinyu
|
b527d23e44
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-09-23 20:51:49 +08:00 |
|
tuxinyu
|
25d14cf9c2
|
1111111111
|
2025-09-23 20:51:42 +08:00 |
|
puxuan
|
689e1a7ef3
|
fix bug
|
2025-09-23 20:48:50 +08:00 |
|
tuxinyu
|
7edaf6ccc0
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-09-23 20:35:52 +08:00 |
|
tuxinyu
|
9cef0fd55f
|
111111111
|
2025-09-23 20:35:42 +08:00 |
|
puxuan
|
5200466331
|
Merge branch 'dev_hero' into dev_equip
|
2025-09-23 16:22:02 +08:00 |
|
puxuan
|
34518800c4
|
fix bug
|
2025-09-22 17:38:01 +08:00 |
|