Commit Graph

124 Commits

Author SHA1 Message Date
73b3f469d0 11.15:更新生态书UI界面以及养成界面岛主与游戏点击弹出暂未开放的弹窗 2024-11-15 11:23:25 +08:00
wulongxiao
c16f6d78fc add 2024-11-15 11:17:28 +08:00
wulongxiao
4d9a1a61a5 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks
# Conflicts:
#	meng_yao/Assets/Scenes/scene_Main.unity
2024-11-14 16:09:35 +08:00
wulongxiao
780103b79d add 2024-11-14 16:08:59 +08:00
d467595a04 add 2024-11-14 16:05:27 +08:00
889e3d0f34 add 2024-11-14 09:36:49 +08:00
wulongxiao
2991afa813 add 2024-11-13 17:59:42 +08:00
9905b03b4f add 2024-11-13 17:58:34 +08:00
五条悟
387f7586c1 生态树UI 2024-11-12 21:48:50 +08:00
1653402fa8 add 2024-11-11 12:04:41 +08:00
b1a06277b8 add 2024-11-05 04:01:02 +08:00
08738b0d26 add 2024-11-04 05:20:09 +08:00
GL
2d669ffabc add 2024-11-03 01:46:19 +08:00
舒荣森
7e1d431cf6 add 2024-11-01 05:26:28 +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
hyskai
e113b604ff add 2024-10-30 18:35:29 +08:00
hyskai
61bb10a75b add 2024-10-30 15:47:47 +08:00
hyskai
e00fe32531 add 2024-10-30 03:43:31 +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
cc65145114 add 2024-10-29 16:57:55 +08:00
hyskai
cf2bfa2893 add 2024-10-29 15:52:43 +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
a6105a85e3 add 2024-10-28 12:11:56 +08:00
dfca1012bb add 2024-10-28 10:57:19 +08:00
820384f14e add 2024-10-26 16:21:29 +08:00
cb7d7b8f40 Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-10-26 14:11:41 +08:00
hyskai
f39fa7c9c3 add 2024-10-25 15:39:27 +08:00
f54b708023 add 2024-10-24 21:45:43 +08:00
hyskai
e88c29f703 add 2024-10-24 18:12:56 +08:00
hyskai
81ede3e160 Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-10-24 17:40:40 +08:00
ef43154b30 ADD 2024-10-24 17:39:01 +08:00
hyskai
e5e7020e54 add 2024-10-24 17:35:43 +08:00
133dca9d2d Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-10-24 17:33:49 +08:00
9d8139c26c Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-10-24 16:25:25 +08:00
8f2ce33d3c Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-10-24 12:50:54 +08:00
hyskai
ef4f40c7b5 add 2024-10-24 12:48:27 +08:00
hyskai
188e3cfcd9 add 2024-10-24 10:48:04 +08:00
hyskai
30616b8029 add 2024-10-24 09:59:58 +08:00
87ee91b809 Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-10-23 19:31:37 +08:00
hyskai
05d674024e addd 2024-10-23 19:22:46 +08:00
eeb5662b8b Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-10-23 19:07:57 +08:00
895f070015 add 2024-10-23 19:06:35 +08:00
hyskai
52415eac94 add 2024-10-23 17:10:04 +08:00
hyskai
9cefc56793 Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-10-23 15:36:25 +08:00
99c66ddd6f add 2024-10-23 15:35:12 +08:00
GL
7a2e678201 add 2024-10-22 22:26:05 +08:00
0802c6c6e8 add 2024-10-20 22:46:28 +08:00
hyskai
647e3a09a0 add 2024-10-20 22:04:23 +08:00
GL
69a1cb3f8b 排行榜 2024-10-20 21:57:46 +08:00
hyskai
31ad8f6d17 add 2024-10-20 21:17:14 +08:00
49215d6ac6 add 2024-10-20 21:14:33 +08:00
hyskai
989a6ebc70 add 2024-10-20 20:45:50 +08:00
hyskai
4ca822aa60 add 2024-10-20 18:29:41 +08:00
GL
a5fed7e37a 商店界面 2024-10-20 17:57:57 +08:00
4b0ad2dd3a add 2024-10-20 17:07:38 +08:00
GL
38404511fb Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-10-20 15:25:36 +08:00
hyskai
8eb002db50 add 2024-10-19 02:50:18 +08:00
448efd915e Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
# Conflicts:
#	meng_yao/Assets/Scenes/main_scene.unity.meta
#	meng_yao/Assets/communal.meta
2024-10-19 02:46:04 +08:00
d2d25d069d add 2024-10-19 02:41:26 +08:00
GL
b09ebeaff2 主界面 2024-10-19 02:39:27 +08:00
hyskai
ba15d26b24 add 2024-10-18 23:43:56 +08:00
7f137d6681 Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks 2024-10-18 22:37:06 +08:00
97e322538c add 2024-10-18 22:33:49 +08:00
GL
b2e87ed535 add 2024-10-18 22:23:56 +08:00
GL
bccb56daf1 Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
# Conflicts:
#	meng_yao/Assets/res/main_slices/主界面.png
2024-10-18 22:15:04 +08:00
GL
6451a74e15 add 2024-10-18 22:13:36 +08:00
hyskai
a4e0c4559a add 2024-10-18 22:07:51 +08:00
hyskai
43cecbdb97 add 2024-10-18 20:50:18 +08:00
hyskai
a26406e7c6 add 2024-10-18 20:46:37 +08:00
hyskai
87483ee227 add 2024-10-18 20:31:25 +08:00