Commit Graph

224 Commits

Author SHA1 Message Date
3b5c92a7f3 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-18 12:03:36 +08:00
b9b9a831fa 生态书团队接口的接入 2024-12-18 12:03:24 +08:00
wulongxiao
23a89db979 修改预制体 2024-12-18 12:01:59 +08:00
GL
4b9f5a5c6e 老虎动画修改 2024-12-17 17:16:00 +08:00
wulongxiao
8ac9c95887 待优化:1:接口的验证码调整,2:敌人点击信息调整,3:敌人波次信息调整,4:波次调整
2024年12月13日,08点47分——wlx——ll
2024-12-13 08:48:10 +08:00
wulongxiao
18a806eccc 登录界面的修改 2024-12-12 23:16:37 +08:00
380e554e5f 火焰 2024-12-12 17:07:02 +08:00
b790ad3493 可以从外面进入游戏关卡了,但是还有小玩样没有做:1:出怪提示.2:怪物波数显示详情信息,3:各个面板的信息需要动态获取,4:怪物和萌宠数值需要动态赋值,5萌妖伤害统计萌妖写 2024-12-10 09:14:54 +08:00
wulongxiao
87d666f79e 导入第一个萌宠tup 2024-12-07 20:42:10 +08:00
wulongxiao
ee7a04e688 战斗ui 2024-12-05 15:48:19 +08:00
7ebea3d3ed 游戏中心动画的修改 2024-11-25 14:35:52 +08:00
6f71ea82bc 动画加到scene了 2024-11-24 23:49:19 +08:00
wulongxiao
fe46937b05 鱼动画x6 2024-11-24 23:29:32 +08:00
wulongxiao
b4be62eaa3 蓝鸭和红鸭动画 2024-11-24 23:21:09 +08:00
wulongxiao
dc36b2c9c3 枪动画 2024-11-24 22:42:51 +08:00
2578850306 枪,鱼,鸭子动画 2024-11-24 22:11:19 +08:00
0ef396758b 返回按钮的修改 2024-11-24 21:45:04 +08:00
huyulong
3ffaa0de8c 西部牛仔的UI 2024-11-22 16:02:54 +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
wulongxiao
6f9a5619e4 调了压缩格式——岛——船,矿工,矿工有点hu,后面继续调 2024-11-18 12:03:32 +08:00
de1b5fb316 养成界面动画的完成 2024-11-16 18:38:34 +08:00
072b0dcd4b 生态树的修改以及全网界面UI的制作以及锁妖塔的跳转 2024-11-16 18:25:44 +08:00
7fb301a95a Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-11-16 17:56:48 +08:00
887c2f1b5e 领奖提现UI以及弹窗的完成 2024-11-16 17:56:30 +08:00
wulongxiao
9d54f7bfe3 add 2024-11-16 17:53:13 +08:00
wulongxiao
2a3874c413 提现面板 2024-11-16 17:38:22 +08:00
e8ac7ee13f add 2024-11-15 15:13:21 +08:00
huyulong
380aef673b Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-11-15 11:40:18 +08:00
huyulong
491d74802c 拉人排行UI 2024-11-15 11:39:32 +08:00
8c4e058a18 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-11-15 11:23:42 +08:00
73b3f469d0 11.15:更新生态书UI界面以及养成界面岛主与游戏点击弹出暂未开放的弹窗 2024-11-15 11:23:25 +08:00
wulongxiao
c16f6d78fc add 2024-11-15 11:17:28 +08:00
3de89bd74d add 2024-11-14 20:31:36 +08:00
6c4c00cbfb add 2024-11-14 20:14:49 +08:00
47700f24f5 add 2024-11-14 10:21:24 +08:00
c1ed2c8805 add 2024-11-14 09:57:30 +08:00
9905b03b4f add 2024-11-13 17:58:34 +08:00
da0423271f add 2024-11-13 11:15:09 +08:00
五条悟
1902cb8ebf Merge branch 'main' of http://sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-11-13 00:13:05 +08:00
五条悟
3bc765d894 UI界面拼接完成 2024-11-13 00:12:44 +08:00
hyskai
999d7ce062 Merge branch 'main' of http://sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-11-12 23:19:05 +08:00
hyskai
06a797c146 add 2024-11-12 23:18:51 +08:00
五条悟
eac98573e5 Merge branch 'main' of http://sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-11-12 21:58:59 +08:00
五条悟
387f7586c1 生态树UI 2024-11-12 21:48:50 +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
14e843f081 add 2024-11-08 16:29:30 +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
b1a06277b8 add 2024-11-05 04:01:02 +08:00
e7ba0a7264 add 2024-11-05 03:16:22 +08:00
1c14a79451 add 2024-11-05 03:02:08 +08:00
580f17a017 add 2024-11-04 20:29:18 +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
08738b0d26 add 2024-11-04 05:20:09 +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
2d669ffabc add 2024-11-03 01:46:19 +08:00
舒荣森
7e1d431cf6 add 2024-11-01 05:26:28 +08:00
舒荣森
fe109c7b14 add 2024-11-01 02:27:50 +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
hyskai
d4dbcbec7e add 2024-10-31 02:49:53 +08:00
hyskai
a28a221302 add 2024-10-31 01:19:19 +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
86eb86152a add 2024-10-30 18:45:08 +08:00
舒荣森
b269076496 add 2024-10-30 17:13:33 +08:00
舒荣森
9398dd1cda add 2024-10-30 16:58:44 +08:00
舒荣森
d3fc9bcae6 Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-10-30 16:41:05 +08:00
舒荣森
9d363e3c19 Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
# Conflicts:
#	meng_yao/Assets/communal/ugui/input_box_pop_up_window/input_box_pop_up_window.cs
2024-10-30 16:40:56 +08:00
hyskai
61bb10a75b add 2024-10-30 15:47:47 +08:00
hyskai
88cd822977 Resolve merge conflicts 2024-10-30 13:21:35 +08:00
舒荣森
158c5f5263 add 2024-10-30 13:18:20 +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
舒荣森
36a66aaf18 add 2024-10-30 06:22:08 +08:00
hyskai
6b0d3121ad add 2024-10-30 04:21:58 +08:00
舒荣森
333b5d2584 Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-10-30 03:42:31 +08:00
舒荣森
d2293d5133 add 2024-10-30 03:42:06 +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
舒荣森
45024d38b7 add 2024-10-29 20:47:58 +08:00
舒荣森
f4e35d9183 Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-10-29 16:01:06 +08:00
舒荣森
9180ab0671 add 2024-10-29 16:00:02 +08:00
hyskai
cf2bfa2893 add 2024-10-29 15:52:43 +08:00
hyskai
0a68cad15b Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-10-29 12:01:46 +08:00
hyskai
cc8f88dc8c add 2024-10-29 12:01:30 +08:00
a5d5de1dc6 Merge branch 'main' of http://sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-10-29 11:54:54 +08:00
5fe07524a2 add 2024-10-29 11:54:22 +08:00
hyskai
4bb937314c add 2024-10-29 11:35:16 +08:00
b55b8e4654 add 2024-10-28 23:10:38 +08:00
hyskai
102eb8820f add 2024-10-28 21:58:27 +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
b22a8cdebf ADD 2024-10-28 11:19:21 +08:00
dfca1012bb add 2024-10-28 10:57:19 +08:00
hyskai
4684cd55b9 dotween 2024-10-26 17:24:48 +08:00