Commit Graph

452 Commits

Author SHA1 Message Date
d0ae7f01ec Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-27 17:11:23 +08:00
877cedd1c9 靓号场景的修改,以及订单预制体的添加跟脚本,修改密码接口完成 2024-11-27 17:11:15 +08:00
wulongxiao
b94ad9a66e Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-27 16:17:15 +08:00
2735086385 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-27 16:15:47 +08:00
739f82d458 修改密码接口脚本编写完成 2024-11-27 16:15:31 +08:00
wulongxiao
93bf9e38b9 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-27 16:14:43 +08:00
wulongxiao
8809141e64 main——修改 2024-11-27 16:14:34 +08:00
huyulong
e810866718 把地址UI加上返回按钮 2024-11-27 16:10:01 +08:00
81a5700d44 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-27 15:59:47 +08:00
57ac99fc81 地址系统8.*接口 2024-11-27 15:58:54 +08:00
wulongxiao
a1c8ee8c64 修改loading 2024-11-27 15:45:34 +08:00
huyulong
c476828a60 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-27 15:39:18 +08:00
huyulong
bfd251ac1d 收货地址 2024-11-27 15:38:53 +08:00
wulongxiao
e89891e582 main更新接入商城 2024-11-27 15:27:50 +08:00
GL
1435ce2043 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/hyskai/_TheStrongestSnail 2024-11-27 15:16:41 +08:00
GL
b4806b81d3 抽奖UI 2024-11-27 15:16:29 +08:00
wulongxiao
d4dff862af Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-27 14:26:56 +08:00
wulongxiao
0fe86e62cb 更新了红点系统 2024-11-27 14:26:45 +08:00
0f0f72cab9 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-27 12:03:28 +08:00
4bf88aaf4b 账号安全,修改密码和注销账号UI界面的制作完成 2024-11-27 12:03:14 +08:00
huyulong
ef8fa4c2dc 更改冲突 两个UI界面 2024-11-27 12:03:02 +08:00
huyulong
c7ac60e14c add两个界面 2024-11-27 11:58:20 +08:00
wulongxiao
13f5d2cdf8 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-27 11:51:03 +08:00
wulongxiao
730f0d33d7 写了个贼牛逼的ui父类 2024-11-27 11:49:57 +08:00
GL
b18f1e9a34 修改中文图片 2024-11-27 11:30:50 +08:00
wulongxiao
acd8b40f0f Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-27 11:26:00 +08:00
wulongxiao
4d93016346 main接入活动 2024-11-27 11:25:42 +08:00
GL
2c2091419d Merge branch 'main' of http://shu.sheziwanglo.cn:3000/hyskai/_TheStrongestSnail 2024-11-27 11:00:19 +08:00
GL
1c50e5fa6b 蜗牛骑士 2024-11-27 11:00:07 +08:00
38343c188a 账号安全UI制作完成,以及字体描边的消除 2024-11-27 10:54:43 +08:00
4f4dbe10d9 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-27 10:47:34 +08:00
9e764a5dfe 账号安全界面UI的制作与字体的添加 2024-11-27 10:47:22 +08:00
huyulong
954ad39f82 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-27 10:45:56 +08:00
huyulong
9ab68f67ac 字库修改 2024-11-27 10:45:51 +08:00
huyulong
ca24188461 字库修改 2024-11-27 10:45:39 +08:00
GL
311c3bb5d7 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/hyskai/_TheStrongestSnail 2024-11-27 10:41:29 +08:00
GL
c46e2da381 蜗牛邀请 2024-11-27 10:41:18 +08:00
huyulong
d0312fc64b 修改和拼接UI 2024-11-27 10:26:12 +08:00
GL
c4697f465d Merge branch 'main' of http://shu.sheziwanglo.cn:3000/hyskai/_TheStrongestSnail 2024-11-27 02:06:20 +08:00
huyulong
a7c8c4c0be Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-27 02:04:57 +08:00
GL
d133f5ee4e Merge branch 'main' of http://shu.sheziwanglo.cn:3000/hyskai/_TheStrongestSnail 2024-11-27 02:04:47 +08:00
huyulong
2424bf90c7 ui变动 2024-11-27 02:04:45 +08:00
GL
2185c778ca 6.2接口 2024-11-27 02:04:37 +08:00
wulongxiao
eb304aa9c8 修改字体突出问题 2024-11-27 01:56:41 +08:00
wulongxiao
cac8fb3968 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-27 01:48:59 +08:00
wulongxiao
29bb71826e logo跳到主场景,主场景接口接上用户信息 2024-11-27 01:48:52 +08:00
fc503fa32c 兑换UI界面的制作跟接口脚本的预留 2024-11-27 01:40:31 +08:00
cef08d3c9a Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-27 01:14:08 +08:00
5219ae6d5c 蜗壳和卡槽的转增接口完成 2024-11-27 01:13:52 +08:00
huyulong
694e658cf2 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-27 01:13:25 +08:00
huyulong
fff0e43737 addUI界面 2024-11-27 01:13:19 +08:00
wulongxiao
b61bd72a0b 主界面只剩接口和合并,修了一下md Fuak change 2024-11-27 00:58:15 +08:00
huyulong
0d96ab769d 实名认证完成界面UI完成 2024-11-27 00:23:32 +08:00
fa73e7ee2f 邀请功能6162接口与新用户信息14接口 2024-11-27 00:17:30 +08:00
huyulong
e1037c770d Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-27 00:00:12 +08:00
huyulong
3012164847 UI实名UI完成 2024-11-27 00:00:07 +08:00
wulongxiao
8f4795ae70 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-26 23:30:16 +08:00
huyulong
93558dd08e Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail 2024-11-26 23:30:03 +08:00
wulongxiao
59efa3a634 添加了mianUI的点击事件 2024-11-26 23:30:03 +08:00
huyulong
8afadfb038 实名UI界面 2024-11-26 23:29:55 +08:00
GL
064298aee2 蜗舍修改 2024-11-26 23:23:36 +08:00
GL
a99f6cf3ad Merge branch 'main' of http://shu.sheziwanglo.cn:3000/hyskai/_TheStrongestSnail 2024-11-26 23:21:12 +08:00
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