Commit Graph

415 Commits

Author SHA1 Message Date
wulongxiao
f6d8db5a5c 接口测试 2024-12-06 16:18:17 +08:00
03574c54a1 工会UI的制作 2024-11-25 17:58:55 +08:00
776eb7322d 动画的修改 2024-11-25 15:53:48 +08:00
7ebea3d3ed 游戏中心动画的修改 2024-11-25 14:35:52 +08:00
a56a2add03 完成所有UI界面的切换 2024-11-24 23:18:10 +08:00
huyulong
f177df2670 制作岛主竞拍和证书界面 2024-11-22 11:51:22 +08:00
huyulong
8e76a2de45 修改了一些UI的问题 2024-11-20 15:27:02 +08:00
a3b4ccbf70 养成界面的动画的制作 2024-11-19 16:48:27 +08:00
wulongxiao
e4be734866 修复bug 2024-11-18 15:46:45 +08:00
ffdce0a623 修改登录进度条 2024-11-18 10:42:48 +08:00
33f9f25140 所有场景制作完成 2024-11-17 01:54:23 +08:00
de1b5fb316 养成界面动画的完成 2024-11-16 18:38:34 +08:00
072b0dcd4b 生态树的修改以及全网界面UI的制作以及锁妖塔的跳转 2024-11-16 18:25:44 +08:00
887c2f1b5e 领奖提现UI以及弹窗的完成 2024-11-16 17:56:30 +08:00
384f902d0e 完成场景,以及图片中文命名的更改 2024-11-16 07:10:28 +08:00
wulongxiao
6b3332dda4 宝石矿完成 2024-11-16 01:53:21 +08:00
wulongxiao
c86ae668fd Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-11-16 01:20:50 +08:00
wulongxiao
3c52cf8589 金沙矿全部制作完成 2024-11-16 01:20:28 +08:00
7413db81c6 主场景 2024-11-16 01:07:21 +08:00
bad526453c Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-11-16 00:22:59 +08:00
huyulong
13a403c7f8 修复老鼠转向问题 2024-11-15 23:57:06 +08:00
huyulong
09cf4ae9e3 修改精灵挖矿Unity崩溃的Bug 2024-11-15 23:36:34 +08:00
b0a0f2425f Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-11-15 22:57:28 +08:00
huyulong
c12208a8e2 jingsha wakuang 2024-11-15 22:44:04 +08:00
7fbf181970 修改了拉新会的UI 2024-11-15 21:40:33 +08:00
huyulong
1b4fbd7eaf add放逻辑代码的文件夹 2024-11-15 19:26:15 +08:00
wulongxiao
f0cc3ac44a 宝石岛更新了一点点 2024-11-15 18:48:38 +08:00
wulongxiao
99ff9cdfe1 金币岛完成90%,需要调整一下动画时间 2024-11-15 17:29:16 +08:00
wulongxiao
84ab13deee 重新岛屿控制,船控制代码 2024-11-15 16:10:51 +08:00
wulongxiao
8cf83787cd add_fish 2024-11-15 16:09:17 +08:00
3bf8b7f673 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-11-15 15:22:55 +08:00
wulongxiao
0514fe07ec 写了一个SpriteAniationpro在communal的ui里,可以选择image播放帧动画,存储个不同状态的动画,通过指定,播放指定的图集,在代码销毁时会自带消除 2024-11-15 15:21:16 +08:00
c0e5cbc88a Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-11-15 15:14:27 +08:00
e8ac7ee13f add 2024-11-15 15:13:21 +08:00
wulongxiao
66a9acc373 scene_jibidao_80%_get_wulongxiao_2024年11月15日_12点12分 2024-11-15 12:12:52 +08:00
73b3f469d0 11.15:更新生态书UI界面以及养成界面岛主与游戏点击弹出暂未开放的弹窗 2024-11-15 11:23:25 +08:00
6c4c00cbfb add 2024-11-14 20:14:49 +08:00
5f4fc9aeb1 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-11-14 17:23:20 +08:00
9a1035ae3b add 2024-11-14 17:23:08 +08:00
wulongxiao
dcf050a2ea add 2024-11-14 17:18:51 +08:00
4c3380fa79 add 2024-11-14 16:15:28 +08:00
d467595a04 add 2024-11-14 16:05:27 +08:00
d5fe981425 add 2024-11-14 10:09:34 +08:00
c1ed2c8805 add 2024-11-14 09:57:30 +08:00
9c80f3f1d3 add 2024-11-14 09:30:55 +08:00
9905b03b4f add 2024-11-13 17:58:34 +08:00
072a7e73ac add 2024-11-13 15:07:51 +08:00
da0423271f add 2024-11-13 11:15:09 +08:00
hyskai
06a797c146 add 2024-11-12 23:18:51 +08:00
935d5d0111 Merge branch 'main' of http://sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-11-12 21:11:32 +08:00
887063e696 ADD 2024-11-12 21:10:56 +08:00
五条悟
f6883778c5 Merge branch 'main' of http://sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-11-12 17:45:54 +08:00
e30b300ec7 add 2024-11-12 17:41:06 +08:00
五条悟
4af70eb693 Merge branch 'main' of http://sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-11-12 17:39:29 +08:00
五条悟
0970585eaf 111 2024-11-12 17:39:14 +08:00
781e30d010 addItem 2024-11-12 17:35:15 +08:00
1653402fa8 add 2024-11-11 12:04:41 +08:00
e8ac7e032e ADD 2024-11-09 00:00:46 +08:00
14e843f081 add 2024-11-08 16:29:30 +08:00
a98c8de2eb add 2024-11-08 00:41:10 +08:00
8010108fb8 add 2024-11-07 20:27:33 +08:00
bdabe1b7b8 add 2024-11-07 18:03:20 +08:00
842fd23e78 add 2024-11-07 14:20:59 +08:00
281f0f9e02 ADD 2024-11-07 00:06:45 +08:00
a845f2f72e add 2024-11-05 17:31:45 +08:00
2149c29713 add 2024-11-05 14:29:51 +08:00
0d502ea39d add 2024-11-05 08:07:27 +08:00
87e51ab6ec add 2024-11-05 07:19:41 +08:00
6430a45dcc add 2024-11-05 07:05:29 +08:00
hyskai
e595df5aa7 add 2024-11-05 06:41:16 +08:00
hyskai
dd956bbfee Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
# Conflicts:
#	meng_yao/Assets/script/cultivation_Jinsha_mine_slices/RoomJinsha.cs
2024-11-05 05:12:13 +08:00
hyskai
5b209726fa add 2024-11-05 05:11:14 +08:00
637a6340e4 add 2024-11-05 05:09:41 +08:00
e9a63b5b8a add 2024-11-05 04:18:32 +08:00
bb5919b1aa Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-11-05 04:06:10 +08:00
940d3343b7 add 2024-11-05 04:05:52 +08:00
hyskai
4088949c52 add 2024-11-05 04:03:26 +08:00
3c285b5ba0 Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-11-05 04:01:23 +08:00
b1a06277b8 add 2024-11-05 04:01:02 +08:00
hyskai
2dc8687b04 add 2024-11-05 03:17:56 +08:00
hyskai
1c964ad849 Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-11-05 02:02:11 +08:00
hyskai
779c57a187 add 2024-11-05 02:01:38 +08:00
357f6d9be6 add 2024-11-05 01:59:52 +08:00
d5d56a89f9 Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-11-04 23:22:05 +08:00
a361bd68c5 add 2024-11-04 23:21:48 +08:00
hyskai
1a65bd5dff add 2024-11-04 23:20:25 +08:00
hyskai
87d9fd73a9 Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-11-04 20:42:57 +08:00
hyskai
e961fc1a6a add 2024-11-04 20:42:02 +08:00
580f17a017 add 2024-11-04 20:29:18 +08:00
hyskai
5ed697e50c add 2024-11-04 07:40:33 +08:00
hyskai
5fa9f73215 add 2024-11-04 07:06:58 +08:00
45b2f333c9 Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-11-04 06:57:52 +08:00
dab82feb2b add 2024-11-04 06:57:36 +08:00
hyskai
7d500806de add 2024-11-04 06:56:09 +08:00
hyskai
c71a049b2b Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-11-04 05:29:11 +08:00
hyskai
0f3dce7c12 add 2024-11-04 05:28:44 +08:00
1e387a93cd Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-11-04 05:20:30 +08:00
08738b0d26 add 2024-11-04 05:20:09 +08:00
hyskai
54fb8ce47b add 2024-11-04 00:45:01 +08:00
hyskai
c68c2f9aaa add 2024-11-03 22:19:59 +08:00
hyskai
e68317c3dc Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-11-03 21:10:27 +08:00
hyskai
a75208ae09 add 2024-11-03 21:10:08 +08:00
546e37820e Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-11-03 21:08:31 +08:00
06626aa29b add 2024-11-03 21:08:15 +08:00
hyskai
cfbc78cbf2 Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-11-03 19:08:15 +08:00
hyskai
85cc6d995c add 2024-11-03 19:07:56 +08:00
441ff1d21d ADD 2024-11-03 19:07:13 +08:00
0059644b31 Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-11-03 18:45:15 +08:00
105c1b3237 add 2024-11-03 18:44:58 +08:00
hyskai
43a749329e add 2024-11-03 18:03:02 +08:00
hyskai
79fb87c16e Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-11-03 17:17:44 +08:00
hyskai
14b6bb128d add 2024-11-03 17:17:24 +08:00
GL
66ba972b73 Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-11-03 16:07:44 +08:00
GL
3baf1259a9 add 2024-11-03 16:07:15 +08:00
760a004c6b add 2024-11-03 15:09:40 +08:00
a01dfe42d4 Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-11-03 04:47:30 +08:00
2584c6b0b5 add 2024-11-03 04:47:11 +08:00
hyskai
d06e80bb4c add 2024-11-03 03:57:31 +08:00
GL
0c9834ab5d Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-11-03 01:46:48 +08:00
GL
2d669ffabc add 2024-11-03 01:46:19 +08:00
hyskai
4fd5b121c1 Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-11-03 01:12:27 +08:00
hyskai
d7823281af add 2024-11-03 01:11:55 +08:00
f6a51cf587 add 2024-11-03 01:08:39 +08:00
02ae2fec04 解决合并冲突 2024-11-03 01:05:24 +08:00
f9ca408f85 add_pop_up 2024-11-03 00:57:23 +08:00
hyskai
a2cf1f4f49 add 2024-11-03 00:43:37 +08:00
hyskai
3d45e6b439 add 2024-11-02 23:44:59 +08:00
hyskai
fafb3a3ba6 add 2024-11-02 23:24:42 +08:00
44524eec82 add 2024-11-02 23:10:40 +08:00
0775e3171f add_pop_up 2024-11-02 23:00:54 +08:00
舒荣森
83da7e8960 add 2024-11-02 11:19:48 +08:00
舒荣森
20d476cc07 add 2024-11-01 13:35:28 +08:00
舒荣森
7e1d431cf6 add 2024-11-01 05:26:28 +08:00
舒荣森
fe109c7b14 add 2024-11-01 02:27:50 +08:00
舒荣森
7fefbf6bb1 Resolve merge conflicts 2024-11-01 00:27:45 +08:00
舒荣森
2bb149a02d add 2024-11-01 00:11:15 +08:00
hyskai
f7e21b67b3 ADD 2024-10-31 20:40:09 +08:00
舒荣森
35c17756ee add 2024-10-31 20:16:46 +08:00
舒荣森
fbacd20c4c Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-10-31 16:51:02 +08:00
舒荣森
9082a536ce add 2024-10-31 16:50:35 +08:00
hyskai
8ece294163 add 2024-10-31 16:04:45 +08:00
舒荣森
c4709d7803 add 2024-10-31 13:27:31 +08:00
舒荣森
6e64f4d87e Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-10-31 02:56:21 +08:00
hyskai
0898c4f976 add 2024-10-31 02:54:24 +08:00
hyskai
d4dbcbec7e add 2024-10-31 02:49:53 +08:00
舒荣森
6841ff6cb1 Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-10-31 01:33:08 +08:00
hyskai
5ee23f80f4 add 2024-10-31 01:29:55 +08:00
舒荣森
4aeb3ebbe0 ADD 2024-10-31 01:28:14 +08:00
hyskai
a28a221302 add 2024-10-31 01:19:19 +08:00
舒荣森
4d14f14085 add 2024-10-30 23:45:19 +08:00
舒荣森
1df706fa79 add 2024-10-30 23:18:31 +08:00
舒荣森
eb2b4211cd add 2024-10-30 22:11:06 +08:00
舒荣森
228192a5c1 add 2024-10-30 22:03:04 +08:00
hyskai
b2434337ae Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-10-30 22:00:53 +08:00
hyskai
291ac4bb27 add 2024-10-30 22:00:36 +08:00
GL
2c130fddb2 Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-10-30 21:51:12 +08:00
GL
98fbf1f376 玩家类,改变马内的方法 2024-10-30 21:49:13 +08:00
舒荣森
6738e67c14 Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-10-30 19:43:38 +08:00
舒荣森
a114da04ba add 2024-10-30 19:42:59 +08:00
GL
2a7695903f Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-10-30 18:45:26 +08:00
GL
86eb86152a add 2024-10-30 18:45:08 +08:00
hyskai
e113b604ff add 2024-10-30 18:35:29 +08:00
hyskai
61bb10a75b add 2024-10-30 15:47:47 +08:00
hyskai
96caa4d13e Resolve merge conflicts 2024-10-30 13:16:11 +08:00
hyskai
52890f81d5 改了一个字体,然后修改了商店 2024-10-30 13:07:34 +08:00
舒荣森
8550d5d74b add 2024-10-30 12:27:47 +08:00
hyskai
680c50e64e Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-10-30 06:25:51 +08:00
hyskai
9e6310c4eb add 2024-10-30 06:25:33 +08:00
a790dbed0f add 2024-10-30 05:06:41 +08:00
hyskai
6289ecfd57 add 2024-10-30 04:46:20 +08:00
hyskai
d392f2ac3b add 2024-10-30 04:35:56 +08:00
hyskai
6b0d3121ad add 2024-10-30 04:21:58 +08:00
b89a86e776 Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-10-30 03:46:10 +08:00
80bede9cdc add 2024-10-30 03:45:54 +08:00
hyskai
837272ef54 add 2024-10-30 02:39:12 +08:00
hyskai
80277e13ec add 2024-10-30 01:34:17 +08:00
hyskai
f401818c64 Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-10-30 01:33:47 +08:00
hyskai
a971720a2e add 2024-10-30 01:33:31 +08:00
1ad4c48386 Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
# Conflicts:
#	meng_yao/Assets/script/Manager/Promptmgr.cs
2024-10-30 01:32:19 +08:00
hyskai
2e3c81564e add 2024-10-30 01:19:18 +08:00
b002910437 Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
# Conflicts:
#	meng_yao/Assets/Scenes/cultivation_Jinsha_mine_slices.unity
#	meng_yao/Assets/script/Manager/Promptmgr.cs
2024-10-30 01:12:03 +08:00
407f043f93 add 2024-10-30 01:08:16 +08:00
hyskai
d598d04bba add 2024-10-30 00:49:26 +08:00
hyskai
f543b2c5e4 Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-10-29 21:27:13 +08:00
hyskai
686370f77c add 2024-10-29 21:26:45 +08:00
舒荣森
45899c03d0 Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-10-29 20:48:07 +08:00
舒荣森
45024d38b7 add 2024-10-29 20:47:58 +08:00
hyskai
cc65145114 add 2024-10-29 16:57:55 +08:00
hyskai
cf2bfa2893 add 2024-10-29 15:52:43 +08:00
hyskai
cc8f88dc8c add 2024-10-29 12:01:30 +08:00
hyskai
4bb937314c add 2024-10-29 11:35:16 +08:00
b55b8e4654 add 2024-10-28 23:10:38 +08:00
200a7e6c0b Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-10-28 22:05:30 +08:00
2c0d6ef7a8 add 2024-10-28 22:05:14 +08:00
hyskai
102eb8820f add 2024-10-28 21:58:27 +08:00
hyskai
3e89a09605 Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-10-28 17:36:07 +08:00
hyskai
a70c30485f add 2024-10-28 17:23:36 +08:00
c1292d4f56 Merge branch 'main' of http://sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-10-28 17:07:35 +08:00
1f5a420c2c add 2024-10-28 17:06:27 +08:00
3229b4f637 add 2024-10-28 16:41:14 +08:00
hyskai
5ddf1ade0d ad 2024-10-28 16:17:07 +08:00
4027cd70c0 Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-10-28 15:37:48 +08:00
b0b089ec67 add 2024-10-28 15:37:21 +08:00
hyskai
a34287a9bd add 2024-10-28 15:33:52 +08:00
hyskai
a6105a85e3 add 2024-10-28 12:11:56 +08:00
hyskai
5c538ffe1c add 2024-10-28 11:28:49 +08:00
dfca1012bb add 2024-10-28 10:57:19 +08:00
hyskai
de51e4559f add 2024-10-28 10:55:47 +08:00
hyskai
d1a6ef800c add 2024-10-26 18:05:52 +08:00
hyskai
4684cd55b9 dotween 2024-10-26 17:24:48 +08:00
hyskai
b63bc24389 add 2024-10-26 16:47:03 +08:00
hyskai
05c93d4ec3 addd 2024-10-26 15:08:13 +08:00
hyskai
647bd625aa add 2024-10-26 10:52:38 +08:00
hyskai
45ed17d777 add 2024-10-25 19:14:25 +08:00
hyskai
c374ce6346 add 2024-10-24 22:11:23 +08:00