506 Commits

Author SHA1 Message Date
changyuxiang
c932ccaba6 竞技场-匹配中和匹配中(。。。) 2025-10-28 20:50:53 +08:00
changyuxiang
8109001683 胜利失败 2025-10-28 19:36:17 +08:00
changyuxiang
5d44b88212 段位图标 2025-10-28 19:31:35 +08:00
changyuxiang
aa4f2bba5f 1 2025-10-27 20:38:43 +08:00
changyuxiang
a6d99ba19b 首充-火花姬 2025-10-23 21:31:00 +08:00
changyuxiang
1aa646ca37 优化技能落点位置 2025-10-18 16:27:33 +08:00
changyuxiang
fc43266090 1 2025-10-18 15:46:17 +08:00
changyuxiang
120d0079ec 改事件帧 2025-10-17 20:27:28 +08:00
changyuxiang
b4d109fbc7 1 2025-10-16 20:25:28 +08:00
changyuxiang
e630c77bb0 1 2025-10-15 21:54:44 +08:00
changyuxiang
328dd55733 1 2025-10-15 21:34:22 +08:00
puxuan
9202d9c83b Merge branch 'dev_hero' into dev_hero_2 2025-10-15 16:12:41 +08:00
changyuxiang
10b5e282f7 七天乐 2025-10-14 20:38:32 +08:00
kai
85fa456381 Merge branch 'dev_hero' into dev_hero_2 2025-10-14 10:08:44 +08:00
changyuxiang
53d965aebc 成长基金 2025-10-13 21:36:19 +08:00
puxuan
7817465e42 Merge branch 'dev_hero' into dev_hero_2 2025-10-13 21:07:56 +08:00
changyuxiang
1387150aa7 在传两个图标 2025-10-13 20:55:38 +08:00
changyuxiang
bce3ff4452 一些活动入口图标 2025-10-13 20:15:20 +08:00
puxuan
1b10f1854f config 2025-10-11 15:57:58 +08:00
changyuxiang
3a3ab128ab Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero 2025-10-10 21:07:06 +08:00
changyuxiang
dfd5a42748 挂机+抽奖入口图标+改英雄可升级动效 2025-10-10 21:05:19 +08:00
puxuan
80db106cd1 Merge branch 'dev_act' into dev_hero 2025-10-10 15:15:22 +08:00
changyuxiang
58bc0cc529 1 2025-10-09 20:47:23 +08:00
changyuxiang
8dfc52ced1 死灵法师改一下 2025-10-08 18:36:29 +08:00
changyuxiang
572ea3e46e 英雄加影子 2025-10-08 17:55:42 +08:00
changyuxiang
033bdbf11f 狼加影子,改抽奖UI动效 2025-10-08 15:23:15 +08:00
changyuxiang
e0d20294fe 1 2025-10-08 14:27:29 +08:00
changyuxiang
d6ea584023 改45001技能 2025-10-08 14:25:10 +08:00
changyuxiang
d161fac759 补充一个,改点东西 2025-10-08 14:07:54 +08:00
changyuxiang
007dbf7d4f 改几个动作 2025-10-07 20:08: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
changyuxiang
cd4622580a 改俩动画 2025-10-07 17:10:38 +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
2a6bdfd66e Merge branch 'dev_hero' into dev_act 2025-09-29 17:38:08 +08:00
changyuxiang
bb804e059a 抽奖 2025-09-28 21:27:28 +08:00
puxuan
c3ce4f0615 Merge branch 'dev_hero' into dev_act 2025-09-28 20:36:36 +08:00
changyuxiang
a1b4dbb1b4 1 2025-09-28 20:30:46 +08:00
changyuxiang
b5981bae15 改个怪物 2025-09-28 20:18:55 +08:00
puxuan
d906155c9c Merge branch 'dev_hero' into dev_act 2025-09-26 09:45:03 +08:00
changyuxiang
d2005a212d 改两个小怪 2025-09-25 21:47:33 +08:00
changyuxiang
fd05b716a9 改一下通用获得动效 2025-09-25 20:07:54 +08:00
changyuxiang
9e5acb67ed 1 2025-09-25 19:31:19 +08:00
puxuan
38345d5909 Merge branch 'dev_hero' into dev_act 2025-09-25 16:41:07 +08:00
puxuan
18296991a2 商业化 2025-09-25 11:41:03 +08:00
changyuxiang
4c7e7aaf78 改点东西 2025-09-24 21:30:32 +08:00
changyuxiang
6f7a26f595 改俩英雄 2025-09-24 20:27:21 +08:00
puxuan
08d3ed2d7e 商店 2025-09-24 16:23:21 +08:00
changyuxiang
060dcda776 1 2025-09-23 21:36:24 +08:00
changyuxiang
ad6cc54cfa 1 2025-09-23 21:23:24 +08:00