huyulong
|
c12208a8e2
|
jingsha wakuang
|
2024-11-15 22:44:04 +08:00 |
|
|
|
42cd324f60
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks
|
2024-11-15 21:40:48 +08:00 |
|
|
|
7fbf181970
|
修改了拉新会的UI
|
2024-11-15 21:40:33 +08:00 |
|
wulongxiao
|
7dbfd8e10f
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks
|
2024-11-15 19:57:00 +08:00 |
|
wulongxiao
|
d7cc9e87b2
|
两个岛都搞完，还需调试
|
2024-11-15 19:56:41 +08:00 |
|
|
|
06327234ff
|
矿
|
2024-11-15 19:48:43 +08:00 |
|
|
|
f8bf6904f2
|
添加矿的底图
|
2024-11-15 19:45:29 +08:00 |
|
huyulong
|
1b4fbd7eaf
|
add放逻辑代码的文件夹
|
2024-11-15 19:26:15 +08:00 |
|
|
|
0b15c922cb
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks
|
2024-11-15 19:09:50 +08:00 |
|
|
|
529d3cf67c
|
11.15 19.09 做完了金沙矿的界面
|
2024-11-15 19:09:32 +08:00 |
|
wulongxiao
|
f0cc3ac44a
|
宝石岛更新了一点点
|
2024-11-15 18:48:38 +08:00 |
|
huyulong
|
5ab04bf75b
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks
|
2024-11-15 17:49:53 +08:00 |
|
huyulong
|
e9a410bf72
|
add 一个岛
|
2024-11-15 17:49:19 +08:00 |
|
|
|
4f54aeef54
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks
|
2024-11-15 17:32:10 +08:00 |
|
|
|
d2a0885bec
|
11.15 17:31 金沙矿的制作
|
2024-11-15 17:31:49 +08:00 |
|
wulongxiao
|
28d3058e6e
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks
|
2024-11-15 17:29:33 +08:00 |
|
wulongxiao
|
99ff9cdfe1
|
金币岛完成90%，需要调整一下动画时间
|
2024-11-15 17:29:16 +08:00 |
|
huyulong
|
941d544821
|
add10个帧动画
|
2024-11-15 17:06:06 +08:00 |
|
wulongxiao
|
c398da97f4
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks
|
2024-11-15 16:11:00 +08:00 |
|
wulongxiao
|
84ab13deee
|
重新岛屿控制，船控制代码
|
2024-11-15 16:10:51 +08:00 |
|
wulongxiao
|
8cf83787cd
|
add_fish
|
2024-11-15 16:09:17 +08:00 |
|
huyulong
|
79c28e4d53
|
add5个帧动画
|
2024-11-15 16:06:28 +08:00 |
|
|
|
0d989c71ab
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks
|
2024-11-15 15:37:26 +08:00 |
|
wulongxiao
|
e98168ef6b
|
add了预制体
|
2024-11-15 15:35:34 +08:00 |
|
|
|
0a57afcb4e
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks
|
2024-11-15 15:33:11 +08:00 |
|
|
|
553a893749
|
a
|
2024-11-15 15:33:01 +08:00 |
|
wulongxiao
|
f23ceda41a
|
add了jiashadao_fishMan1预制体
|
2024-11-15 15:31:57 +08:00 |
|
wulongxiao
|
2372db4e14
|
添加自动销毁
|
2024-11-15 15:24:50 +08:00 |
|
|
|
3bf8b7f673
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks
|
2024-11-15 15:22:55 +08:00 |
|
|
|
976e70667d
|
11.15:添加拉新榜UI以及联系客服的弹窗
|
2024-11-15 15:22:46 +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 |
|
|
|
4a308f99a9
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks
|
2024-11-15 11:42:18 +08:00 |
|
|
|
05a243c348
|
无修改,纯提交
|
2024-11-15 11:42:04 +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 |
|
|
|
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 |
|
|
|
e5826cc766
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks
|
2024-11-14 16:37:20 +08:00 |
|
wulongxiao
|
c8a9e9e5d6
|
add
|
2024-11-14 16:35:55 +08:00 |
|
|
|
abaaf1b108
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks
|
2024-11-14 16:15:39 +08:00 |
|
|
|
4c3380fa79
|
add
|
2024-11-14 16:15: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 |
|
|
|
cdb7c8c77f
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks
|
2024-11-14 16:06:30 +08:00 |
|
|
|
d467595a04
|
add
|
2024-11-14 16:05:27 +08:00 |
|
wulongxiao
|
fa03dc6450
|
Merge branch 'main' of http://2089254lsri2.vicp.fun:3000/shurongsen/Cute_demon_attacks
|
2024-11-14 10:21:58 +08:00 |
|
wulongxiao
|
d6d2d39017
|
add
|
2024-11-14 10:21:44 +08:00 |
|
|
|
47700f24f5
|
add
|
2024-11-14 10:21:24 +08:00 |
|
|
|
d5fe981425
|
add
|
2024-11-14 10:09:34 +08:00 |
|
|
|
c1ed2c8805
|
add
|
2024-11-14 09:57:30 +08:00 |
|
|
|
e9c6d86bca
|
Merge branch 'main' of http://2089254lsri2.vicp.fun:3000/shurongsen/Cute_demon_attacks
|
2024-11-14 09:36:56 +08:00 |
|
|
|
889e3d0f34
|
add
|
2024-11-14 09:36:49 +08:00 |
|
wulongxiao
|
38d86aad56
|
add
|
2024-11-14 09:32:27 +08:00 |
|
|
|
9c80f3f1d3
|
add
|
2024-11-14 09:30:55 +08:00 |
|
wulongxiao
|
2991afa813
|
add
|
2024-11-13 17:59:42 +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 |
|
|
|
94ff59d080
|
add
|
2024-11-13 10:10:33 +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 |
|
五条悟
|
f972fd9128
|
1
|
2024-11-12 20:19:14 +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 |
|
|
|
a8e7ff771c
|
add
|
2024-11-07 20:43:21 +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 |
|
|
|
79fcf4bd28
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-11-05 04:18:42 +08:00 |
|
|
|
e9a63b5b8a
|
add
|
2024-11-05 04:18:32 +08:00 |
|
hyskai
|
86ef0039d5
|
add
|
2024-11-05 04:12:52 +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
|
b0d5c87d05
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-11-05 03:17:42 +08:00 |
|
|
|
e7ba0a7264
|
add
|
2024-11-05 03:16:22 +08:00 |
|
hyskai
|
43f4211d72
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-11-05 03:04:22 +08:00 |
|
|
|
1c14a79451
|
add
|
2024-11-05 03:02:08 +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 |
|
|
|
7070ad13bb
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-11-03 22:21:10 +08:00 |
|
|
|
4a7525bc50
|
add
|
2024-11-03 22:20:51 +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 |
|
|
|
66ba972b73
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-11-03 16:07:44 +08:00 |
|
|
|
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 |
|
|
|
0c9834ab5d
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-11-03 01:46:48 +08:00 |
|
|
|
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 |
|
舒荣森
|
67fd05c93a
|
add
|
2024-10-31 20:29:55 +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 |
|
舒荣森
|
73dc62d4d0
|
add
|
2024-10-31 13:35:08 +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 |
|
|
|
2c130fddb2
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-30 21:51:12 +08:00 |
|
|
|
98fbf1f376
|
玩家类，改变马内的方法
|
2024-10-30 21:49:13 +08:00 |
|
hyskai
|
598f279303
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-30 19:50:32 +08:00 |
|
hyskai
|
b0ace2f84b
|
add
|
2024-10-30 19:50: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 |
|
hyskai
|
581aeb516c
|
add
|
2024-10-30 19:10:14 +08:00 |
|
hyskai
|
f51b5f1d5a
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-30 18:49:33 +08:00 |
|
hyskai
|
bb2bfb3c8f
|
add
|
2024-10-30 18:49:18 +08:00 |
|
|
|
2a7695903f
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-30 18:45:26 +08:00 |
|
|
|
86eb86152a
|
add
|
2024-10-30 18:45:08 +08:00 |
|
hyskai
|
2981849562
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-30 18:36:03 +08:00 |
|
hyskai
|
e113b604ff
|
add
|
2024-10-30 18:35:29 +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
|
fb16438f99
|
add
|
2024-10-30 06:34:34 +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 |
|
舒荣森
|
66be58bbeb
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-30 06:22:17 +08:00 |
|
舒荣森
|
36a66aaf18
|
add
|
2024-10-30 06:22:08 +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
|
ced9ac01f5
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-30 04:26:30 +08:00 |
|
hyskai
|
6b0d3121ad
|
add
|
2024-10-30 04:21:58 +08:00 |
|
|
|
45885f1437
|
add
|
2024-10-30 03:49:53 +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
|
e00fe32531
|
add
|
2024-10-30 03:43:31 +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 |
|
hyskai
|
5f4434d631
|
add
|
2024-10-30 03:32:25 +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 |
|
舒荣森
|
733573c76a
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-30 01:29:15 +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 |
|
舒荣森
|
100b866564
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-30 01:07:10 +08:00 |
|
舒荣森
|
088b92a5b1
|
add
|
2024-10-30 01:06:46 +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
|
72f4218f0f
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-29 16:58:14 +08:00 |
|
hyskai
|
cc65145114
|
add
|
2024-10-29 16:57:55 +08:00 |
|
