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 |
|
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
|
8ae9b1c288
|
。
|
2025-09-24 12:04:04 +08:00 |
|
puxuan
|
87b4c11a9c
|
阵容
|
2025-09-24 12:03:05 +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 |
|
changyuxiang
|
060dcda776
|
1
|
2025-09-23 21:36:24 +08:00 |
|
changyuxiang
|
72123ff72e
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-09-23 21:23:27 +08:00 |
|
changyuxiang
|
ad6cc54cfa
|
1
|
2025-09-23 21:23:24 +08:00 |
|
tuxinyu
|
a7d661556a
|
1111111
|
2025-09-23 21:22:43 +08:00 |
|
changyuxiang
|
6423f40b58
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-09-23 21:11:27 +08:00 |
|
changyuxiang
|
6d5086d5e6
|
1
|
2025-09-23 21:11:22 +08:00 |
|
puxuan
|
be9a8be241
|
fix bug
|
2025-09-23 21:10:20 +08:00 |
|
puxuan
|
aa2648ce08
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-09-23 20:58:33 +08:00 |
|
puxuan
|
dee92b0594
|
fix bug
|
2025-09-23 20:58:26 +08:00 |
|
changyuxiang
|
65574eecaa
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-09-23 20:57:20 +08:00 |
|
changyuxiang
|
db1f0229db
|
改点东西
|
2025-09-23 20:57:17 +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 |
|