Commit Graph

390 Commits

Author SHA1 Message Date
GL
83e2a36978 蜗舍 2024-11-26 23:21:01 +08:00
huyulong
281853f538 增加UI场景 2024-11-26 23:14:11 +08:00
2540173e0e Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-26 22:51:54 +08:00
c9b36e34e7 数据版场景的修改 2024-11-26 22:51:43 +08:00
舒荣森
fcb25b493a Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-26 22:48:20 +08:00
舒荣森
961f862c35 add 2024-11-26 22:47:41 +08:00
a577cf2793 数据版场景 2024-11-26 22:47:10 +08:00
c964976fb7 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-26 22:45:15 +08:00
f907ccbc73 增加字体 2024-11-26 22:43:10 +08:00
舒荣森
c917d8c104 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-26 22:41:32 +08:00
舒荣森
1cdc18e711 add 2024-11-26 22:41:24 +08:00
wulongxiao
50fb095bd0 mian——scene,UI完成 2024-11-26 22:41:09 +08:00
舒荣森
421532e571 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-26 21:53:37 +08:00
舒荣森
c1ae0f6e2e add 2024-11-26 21:53:31 +08:00
huyulong
280c9b9fb8 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-26 21:49:50 +08:00
huyulong
5fbcb748c3 更改文件夹 2024-11-26 21:49:37 +08:00
GL
93c812febc Merge branch 'main' of http://shu.sheziwanglo.cn:3000/hyskai/_TheStrongestSnail 2024-11-26 21:37:07 +08:00
GL
a2a23e0227 蜗牛进房间随机移动 2024-11-26 21:36:55 +08:00
eebc7f4307 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-26 21:16:23 +08:00
f713d60e13 靓号获取与购买接口的完成 2024-11-26 21:16:12 +08:00
wulongxiao
b1272d1424 main修改 2024-11-26 18:23:59 +08:00
舒荣森
71a9d3292f add 2024-11-26 18:19:49 +08:00
舒荣森
a635cdf650 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-26 18:14:24 +08:00
舒荣森
0a90f577ae add 2024-11-26 18:14:09 +08:00
huyulong
7022b819da Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-26 17:54:40 +08:00
huyulong
120f9919bf 调整代码 2024-11-26 17:54:34 +08:00
GL
2208954fd4 bossBUg修复,更改资源名字 2024-11-26 17:47:32 +08:00
wulongxiao
de11b880ef main逻辑做完90% 2024-11-26 17:41:48 +08:00
14d1eb5979 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-26 17:36:03 +08:00
83deb63a95 靓号item预制体的修改 2024-11-26 17:35:52 +08:00
huyulong
3941b783ba 更改lqUI 2024-11-26 17:23:21 +08:00
GL
c41706b7c0 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/hyskai/_TheStrongestSnail 2024-11-26 17:13:48 +08:00
GL
4b901d0488 结算光效动画 2024-11-26 17:13:34 +08:00
cac5ae4ff1 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-26 17:12:22 +08:00
a600c3b4e2 靓号item的生成 2024-11-26 17:12:11 +08:00
huyulong
a95d8b5c47 UI变动 2024-11-26 17:11:27 +08:00
wulongxiao
0ad92ee3f4 return按钮添加脚本 2024-11-26 17:03:30 +08:00
huyulong
09018ea210 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-26 16:54:41 +08:00
huyulong
a13e8542e7 登录界面加字 2024-11-26 16:54:30 +08:00
舒荣森
2791991b56 add 2024-11-26 16:54:06 +08:00
舒荣森
13015a5d32 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-26 16:41:08 +08:00
舒荣森
5e34df456e add 2024-11-26 16:40:57 +08:00
GL
d6bcb3dc91 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/hyskai/_TheStrongestSnail 2024-11-26 16:28:41 +08:00
GL
26e6845a5d 排行榜字体颜色修改 2024-11-26 16:28:30 +08:00
huyulong
f1641e45fa byd公会逻辑弄完了 2024-11-26 16:26:07 +08:00
huyulong
fc81d191f3 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-26 15:51:53 +08:00
huyulong
4c6319cce0 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-26 15:51:00 +08:00
舒荣森
96f26f2bca Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-26 15:50:57 +08:00
舒荣森
26bb116f6c add 2024-11-26 15:50:49 +08:00
huyulong
9e5649a3c6 UI更改他们的傻逼甲方改公会了 2024-11-26 15:50:37 +08:00
GL
1b2f6d9fb4 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/hyskai/_TheStrongestSnail 2024-11-26 15:48:32 +08:00
GL
6db1d44302 排行榜ojbk 2024-11-26 15:48:20 +08:00
wulongxiao
9b12888295 改了几个注释base 2024-11-26 15:33:45 +08:00
GL
ceb4fb78fc Merge branch 'main' of http://shu.sheziwanglo.cn:3000/hyskai/_TheStrongestSnail 2024-11-26 14:07:20 +08:00
GL
0f5905ff20 排行榜数据接入 2024-11-26 14:07:07 +08:00
wulongxiao
0fe1ed83bd 主界面动画跟对面原画对接了 2024-11-26 10:57:53 +08:00
wulongxiao
fbdf0c64b1 三个活动相关panel,退出的逻辑 2024-11-26 10:14:26 +08:00
舒荣森
00e88c5d0f 修改 2024-11-26 09:25:22 +08:00
舒荣森
b879e47c02 主菜单移动修复 2024-11-26 02:59:54 +08:00
舒荣森
173e5b7723 版本修改,感觉有问题建议你们先自己备份再拉 2024-11-26 02:14:48 +08:00
舒荣森
bfca46aa5f Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail
# Conflicts:
#	TheStrongestSnail/Assets/Scenes/Test.unity
2024-11-26 02:11:29 +08:00
舒荣森
a3af9db6f7 add 2024-11-26 02:09:38 +08:00
huyulong
b28b874dc5 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-26 00:44:27 +08:00
huyulong
2be79bce9b 公会列表信息读取完,准备做公会详细信息 2024-11-26 00:44:22 +08:00
1cd3bac6af Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-26 00:42:05 +08:00
ece8bc610e 靓号等待接口 2024-11-26 00:41:57 +08:00
lq
d28c6a4f82 个人中心UI修改 2024-11-26 00:40:56 +08:00
wulongxiao
210351bef2 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-26 00:39:57 +08:00
wulongxiao
f6802b4675 scene_滑动加点击动画 2024-11-26 00:39:25 +08:00
91d6cd534d 靓号池分页、工会分页、工会详情、蜗牛骑士全部接口 2024-11-26 00:07:12 +08:00
GL
1ba30fa04c Merge branch 'main' of http://shu.sheziwanglo.cn:3000/hyskai/_TheStrongestSnail 2024-11-25 23:58:31 +08:00
GL
2e34bbd0c3 UI图片 2024-11-25 23:58:19 +08:00
huyulong
211e72cc58 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-25 23:55:04 +08:00
huyulong
68a7d4b030 公会ui相关逻辑代码 2024-11-25 23:54:53 +08:00
wulongxiao
f22cce4a97 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-25 23:46:52 +08:00
wulongxiao
dea8a2dffb main——scene滑动动画 2024-11-25 23:46:35 +08:00
9f25c09a8f Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-25 23:35:35 +08:00
af09555a6b 靓号界面预制体以及的脚本的修改 2024-11-25 23:35:20 +08:00
舒荣森
ee990e679b Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-25 23:32:03 +08:00
舒荣森
f8f446112f 公共弹窗添加 2024-11-25 23:31:50 +08:00
GL
b0b082eaca Merge branch 'main' of http://shu.sheziwanglo.cn:3000/hyskai/_TheStrongestSnail 2024-11-25 23:27:59 +08:00
GL
57d6207eab 灵液UI 2024-11-25 23:27:41 +08:00
fd1f1f3bbc Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-25 22:58:47 +08:00
c3ccf36581 靓号UI逻辑的书写 2024-11-25 22:58:30 +08:00
huyulong
4295e0f2b5 加了接口文件 2024-11-25 22:57:46 +08:00
GL
3626d3b24b Merge branch 'main' of http://shu.sheziwanglo.cn:3000/hyskai/_TheStrongestSnail 2024-11-25 22:24:36 +08:00
GL
b4c8a171e9 排行榜前端接口,等待后端问题反馈 2024-11-25 22:24:23 +08:00
lq
89e681f795 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-25 22:22:05 +08:00
8b79a00b01 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-25 22:20:56 +08:00
8d27915a14 靓号商店的购买弹窗书写以及改变预制体的位置 2024-11-25 22:20:23 +08:00
lq
7cddb0da3b 个人中心UI逻辑 2024-11-25 22:18:57 +08:00
wulongxiao
067758e715 fuck main BTN 2024-11-25 22:14:18 +08:00
huyulong
bccf2346a2 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-25 22:11:23 +08:00
huyulong
f91c5fa859 加了公会接口,公会动态生成 2024-11-25 22:11:11 +08:00
wulongxiao
878b749f3f main_BTN 2024-11-25 21:39:05 +08:00
1cc354b3cd Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-25 21:37:41 +08:00
79bdd1a8d0 靓号弹窗的修改 2024-11-25 21:37:31 +08:00
舒荣森
2dda0e26f5 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-25 21:35:41 +08:00
舒荣森
91eee3e881 转换修改 2024-11-25 21:35:29 +08:00
GL
1928c221d5 排行榜正在编辑 2024-11-25 21:25:28 +08:00
2d668d69f5 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-25 21:18:46 +08:00
14e2916b1d 靓号UI完成修改以及脚本文件夹的添加 2024-11-25 21:18:40 +08:00
huyulong
8a42d4f904 UI界面预制体 2024-11-25 21:10:11 +08:00
17988c2b28 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-25 20:59:14 +08:00
cf1cb8a1cf 靓号商店预制体的修改 2024-11-25 20:59:01 +08:00
huyulong
f815e23f9e Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-25 20:56:38 +08:00
huyulong
aea2282e3b 更新ui图标 2024-11-25 20:56:27 +08:00
wulongxiao
b49209bf16 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-25 20:52:32 +08:00
wulongxiao
608904354b 更新Main 2024-11-25 20:52:24 +08:00
lq
75d809881f Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-25 20:51:08 +08:00
lq
8360e6141f UI更改 2024-11-25 20:50:33 +08:00
huyulong
6de07803d9 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-25 20:26:25 +08:00
huyulong
17d2fca42d UI改正 2024-11-25 20:26:13 +08:00
wulongxiao
7818ae6ec8 mian——UI——拼完了 2024-11-25 20:08:41 +08:00
GL
ba949f693d 图片改精灵 2024-11-25 19:45:47 +08:00
wulongxiao
5c2a6b4637 中文名修改 2024-11-25 19:39:30 +08:00
wulongxiao
8e7662930c Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-25 17:58:51 +08:00
wulongxiao
4601453487 mainSene更新 2024-11-25 17:58:43 +08:00
GL
6f1526e03f UI拉斯 2024-11-25 17:57:19 +08:00
wulongxiao
5bca45c7a2 main——scene 2024-11-25 17:18:11 +08:00
GL
681ccf3886 参与记录完善基本完成 2024-11-25 17:16:41 +08:00
GL
3182f7e5e5 蜗牛参与记录显示文本改善 2024-11-25 15:57:15 +08:00
舒荣森
24e58e1541 排行榜 2024-11-25 15:55:21 +08:00
舒荣森
f57812d5eb Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-25 15:47:51 +08:00
舒荣森
4dd1598ecb ui修改 2024-11-25 15:46:54 +08:00
wulongxiao
99d22b8250 mainscene 2024-11-25 15:44:44 +08:00
GL
d6f2176295 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/hyskai/_TheStrongestSnail 2024-11-25 14:37:59 +08:00
GL
4d2158e6c2 用户参与记录接口 2024-11-25 14:37:44 +08:00
wulongxiao
8182cd9615 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-25 14:35:41 +08:00
wulongxiao
a6f44a0a8c 写了一个baseUI基类 2024-11-25 14:35:28 +08:00
huyulong
0cc712b335 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-24 00:38:04 +08:00
wulongxiao
2c1ecc92c1 修改lq字体 2024-11-24 00:36:28 +08:00
wulongxiao
9b1df93b87 活动panel完了 2024-11-24 00:30:50 +08:00
6386e16bf4 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-24 00:28:19 +08:00
f465f76553 修改加密狗 2024-11-24 00:28:07 +08:00
huyulong
b5a64e0f22 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-24 00:26:32 +08:00
huyulong
c2fc191bc0 背包UI完成 2024-11-24 00:26:24 +08:00
GL
66c870524b Merge branch 'main' of http://shu.sheziwanglo.cn:3000/hyskai/_TheStrongestSnail 2024-11-24 00:25:10 +08:00
GL
0cb091460a 字体 2024-11-24 00:24:52 +08:00
lq
46bfd14c87 lq版本更新 2024-11-24 00:23:08 +08:00
3a1debee82 保密狗的添加 2024-11-24 00:21:41 +08:00
aafb06ce93 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-24 00:15:52 +08:00
4808b3c62f 字体的增加以及公告UI的制作以及预制体描边的修改 2024-11-24 00:14:13 +08:00
GL
d5d8f4179c Merge branch 'main' of http://shu.sheziwanglo.cn:3000/hyskai/_TheStrongestSnail 2024-11-24 00:11:50 +08:00
GL
034fe12998 gl字体修改 2024-11-24 00:11:38 +08:00
wulongxiao
19cd07f14c Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-24 00:11:14 +08:00
wulongxiao
25065afa01 huodongmianban 2024-11-24 00:11:07 +08:00
GL
e1081601a9 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/hyskai/_TheStrongestSnail 2024-11-24 00:01:46 +08:00
GL
2bbc41385c 排行榜fatherChange 2024-11-24 00:01:23 +08:00
wulongxiao
98f67f0d90 活动Panel 2024-11-23 23:58:42 +08:00