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
|
7b6ede56cc
|
。
|
2025-10-07 18:30:02 +08:00 |
|
puxuan
|
614909a19f
|
每日挑战
|
2025-10-07 18:28:34 +08:00 |
|
puxuan
|
8060568ced
|
签到
|
2025-10-07 17:19:46 +08:00 |
|
changyuxiang
|
cd4622580a
|
改俩动画
|
2025-10-07 17:10:38 +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
|
479c5976ec
|
Merge branch 'dev_hero' into dev_act
|
2025-09-30 09:32:23 +08:00 |
|
changyuxiang
|
603a25ed57
|
改怪
|
2025-09-29 21:34:01 +08:00 |
|
puxuan
|
6fc419c7ce
|
.
|
2025-09-29 21:17:42 +08:00 |
|
puxuan
|
c819d7ce8a
|
礼包
|
2025-09-29 21:10:50 +08:00 |
|
puxuan
|
7b4916851e
|
基金
|
2025-09-29 19:53:13 +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
|
e911269404
|
活动
|
2025-09-29 17:03:14 +08:00 |
|
puxuan
|
e57618f534
|
冲刺
|
2025-09-29 16:27:54 +08:00 |
|
puxuan
|
d8249cc3ac
|
冲刺
|
2025-09-29 15:37:57 +08:00 |
|
changyuxiang
|
bb804e059a
|
抽奖
|
2025-09-28 21:27:28 +08:00 |
|
puxuan
|
778505742a
|
lua
|
2025-09-28 20:37:41 +08:00 |
|
puxuan
|
c3ce4f0615
|
Merge branch 'dev_hero' into dev_act
|
2025-09-28 20:36:36 +08:00 |
|
changyuxiang
|
c1e72278f0
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-09-28 20:30:54 +08:00 |
|
changyuxiang
|
a1b4dbb1b4
|
1
|
2025-09-28 20:30:46 +08:00 |
|
changyuxiang
|
b5981bae15
|
改个怪物
|
2025-09-28 20:18:55 +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
|
e10aa91ae9
|
冲刺活动
|
2025-09-28 14:43:19 +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 |
|
changyuxiang
|
d2005a212d
|
改两个小怪
|
2025-09-25 21:47:33 +08:00 |
|
puxuan
|
e91c3d797d
|
冲刺活动
|
2025-09-25 20:13:36 +08:00 |
|
changyuxiang
|
eddc613d25
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-09-25 20:07:58 +08:00 |
|
changyuxiang
|
fd05b716a9
|
改一下通用获得动效
|
2025-09-25 20:07:54 +08:00 |
|
tuxinyu
|
cdce72b7a2
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-09-25 19:35:08 +08:00 |
|
changyuxiang
|
9e5acb67ed
|
1
|
2025-09-25 19:31:19 +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 |
|
changyuxiang
|
955d7cca3f
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-09-24 21:30:40 +08:00 |
|
changyuxiang
|
4c7e7aaf78
|
改点东西
|
2025-09-24 21:30:32 +08:00 |
|
tuxinyu
|
d3e870351b
|
11111111
|
2025-09-24 21:14:35 +08:00 |
|
tuxinyu
|
cfed0a625f
|
111111111
|
2025-09-24 20:49:02 +08:00 |
|
changyuxiang
|
6f7a26f595
|
改俩英雄
|
2025-09-24 20:27:21 +08:00 |
|