|
|
c5a11161f2
|
钓手背景的修改
|
2024-11-24 21:39:09 +08:00 |
|
|
|
3ff7b502b8
|
最强钓手UI的制作完成
|
2024-11-23 17:40:34 +08:00 |
|
|
|
08f641e2e0
|
游戏中心UI界面的制作
|
2024-11-23 16:07:34 +08:00 |
|
|
|
f83c90d26f
|
无用
|
2024-11-23 15:09:02 +08:00 |
|
|
|
2e1e4772a5
|
钓手UI制作的完成
|
2024-11-22 17:14:29 +08:00 |
|
huyulong
|
485ff4b8f7
|
西部牛仔UI的修改
|
2024-11-22 16:20:50 +08:00 |
|
huyulong
|
3ffaa0de8c
|
西部牛仔的UI
|
2024-11-22 16:02:54 +08:00 |
|
huyulong
|
f177df2670
|
制作岛主竞拍和证书界面
|
2024-11-22 11:51:22 +08:00 |
|
huyulong
|
8e76a2de45
|
修改了一些UI的问题
|
2024-11-20 15:27:02 +08:00 |
|
|
|
adda1a5be1
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks
|
2024-11-19 16:48:59 +08:00 |
|
|
|
a3b4ccbf70
|
养成界面的动画的制作
|
2024-11-19 16:48:27 +08:00 |
|
wulongxiao
|
5c6c01c207
|
新建游戏场景
|
2024-11-19 15:20:39 +08:00 |
|
wulongxiao
|
5b6619eef2
|
修改包体大小
|
2024-11-18 15:58:45 +08:00 |
|
wulongxiao
|
e4be734866
|
修复bug
|
2024-11-18 15:46:45 +08:00 |
|
|
|
33f9f25140
|
所有场景制作完成
|
2024-11-17 01:54:23 +08:00 |
|
wulongxiao
|
f106a5ebea
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks
|
2024-11-16 18:40:31 +08:00 |
|
wulongxiao
|
4ad6518f4f
|
锁妖塔
|
2024-11-16 18:40:13 +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 |
|
|
|
11a3e711af
|
修改两个矿界面
|
2024-11-16 17:42:41 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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
|
99ff9cdfe1
|
金币岛完成90%，需要调整一下动画时间
|
2024-11-15 17:29:16 +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
|
8cf83787cd
|
add_fish
|
2024-11-15 16:09:17 +08:00 |
|
huyulong
|
79c28e4d53
|
add5个帧动画
|
2024-11-15 16:06:28 +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 |
|
|
|
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 |
|
五条悟
|
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 |
|
|
|
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 |
|
|
|
6430a45dcc
|
add
|
2024-11-05 07:05:29 +08:00 |
|
hyskai
|
e595df5aa7
|
add
|
2024-11-05 06:41:16 +08:00 |
|
hyskai
|
5b209726fa
|
add
|
2024-11-05 05:11:14 +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 |
|
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
|
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 |
|
|
|
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
|
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
|
85cc6d995c
|
add
|
2024-11-03 19:07:56 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
0775e3171f
|
add_pop_up
|
2024-11-02 23:00:54 +08:00 |
|
舒荣森
|
83da7e8960
|
add
|
2024-11-02 11:19:48 +08:00 |
|
舒荣森
|
7e1d431cf6
|
add
|
2024-11-01 05:26:28 +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 |
|
舒荣森
|
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
|
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 |
|
舒荣森
|
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
|
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
|
e00fe32531
|
add
|
2024-10-30 03:43:31 +08:00 |
|
hyskai
|
5f4434d631
|
add
|
2024-10-30 03:32:25 +08:00 |
|
hyskai
|
837272ef54
|
add
|
2024-10-30 02:39:12 +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
|
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 |
|
舒荣森
|
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 |
|
|
|
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
|
90fe4b1a60
|
add
|
2024-10-28 17:45:50 +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 |
|
hyskai
|
5ddf1ade0d
|
ad
|
2024-10-28 16:17:07 +08:00 |
|
hyskai
|
823a283b2a
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-28 15:43:38 +08:00 |
|
hyskai
|
3d0abc7aba
|
add
|
2024-10-28 15:43:26 +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 |
|
hyskai
|
b22a8cdebf
|
ADD
|
2024-10-28 11:19:21 +08:00 |
|
|
|
dfca1012bb
|
add
|
2024-10-28 10:57:19 +08:00 |
|
hyskai
|
de51e4559f
|
add
|
2024-10-28 10:55:47 +08:00 |
|
|
|
bda87bdcd1
|
add
|
2024-10-26 21:00:23 +08:00 |
|
hyskai
|
d1a6ef800c
|
add
|
2024-10-26 18:05:52 +08:00 |
|
|
|
ab8a9ec6bb
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-26 16:47:29 +08:00 |
|
|
|
553ebd9908
|
add
|
2024-10-26 16:47:21 +08:00 |
|
hyskai
|
b63bc24389
|
add
|
2024-10-26 16:47:03 +08:00 |
|
|
|
820384f14e
|
add
|
2024-10-26 16:21:29 +08:00 |
|
hyskai
|
d6515fc3ed
|
add
|
2024-10-26 15:10:11 +08:00 |
|
hyskai
|
a300066627
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-26 15:08:31 +08:00 |
|
hyskai
|
05c93d4ec3
|
addd
|
2024-10-26 15:08:13 +08:00 |
|
|
|
8436260691
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
# Conflicts:
# meng_yao/Assets/Scenes/mining_buyingTalents_Scene.unity
|
2024-10-26 14:21:12 +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
|
647bd625aa
|
add
|
2024-10-26 10:52:38 +08:00 |
|
hyskai
|
02ac6c93c3
|
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/animation/miner/masonry_man/miner_dig_1.png.meta
# meng_yao/Assets/animation/miner/masonry_man/miner_dig_10.png
# meng_yao/Assets/animation/miner/masonry_man/miner_dig_10.png.meta
# meng_yao/Assets/animation/miner/masonry_man/miner_dig_6.png
# meng_yao/Assets/animation/miner/masonry_man/miner_dig_6.png.meta
# meng_yao/Assets/animation/miner/masonry_man/miner_dig_7.png
# meng_yao/Assets/animation/miner/masonry_man/miner_dig_7.png.meta
# meng_yao/Assets/animation/miner/masonry_man/miner_dig_8.png
# meng_yao/Assets/animation/miner/masonry_man/miner_dig_8.png.meta
# meng_yao/Assets/animation/miner/masonry_man/miner_dig_9.png
# meng_yao/Assets/animation/miner/masonry_man/miner_dig_9.png.meta
# meng_yao/Assets/animation/miner/masonry_man/miner_move_10.png
# meng_yao/Assets/animation/miner/masonry_man/miner_move_10.png.meta
# meng_yao/Assets/animation/miner/masonry_man/miner_move_6.png
# meng_yao/Assets/animation/miner/masonry_man/miner_move_6.png.meta
# meng_yao/Assets/animation/miner/masonry_man/miner_move_7.png
# meng_yao/Assets/animation/miner/masonry_man/miner_move_7.png.meta
# meng_yao/Assets/animation/miner/masonry_man/miner_move_8.png
# meng_yao/Assets/animation/miner/masonry_man/miner_move_8.png.meta
# meng_yao/Assets/animation/miner/masonry_man/miner_move_9.png
# meng_yao/Assets/animation/miner/masonry_man/miner_move_9.png.meta
# meng_yao/Assets/animation/miner/masonry_man/miner_stand_10.png
# meng_yao/Assets/animation/miner/masonry_man/miner_stand_10.png.meta
# meng_yao/Assets/animation/miner/masonry_man/miner_stand_6.png
# meng_yao/Assets/animation/miner/masonry_man/miner_stand_6.png.meta
# meng_yao/Assets/animation/miner/masonry_man/miner_stand_7.png
# meng_yao/Assets/animation/miner/masonry_man/miner_stand_7.png.meta
# meng_yao/Assets/animation/miner/masonry_man/miner_stand_8.png
# meng_yao/Assets/animation/miner/masonry_man/miner_stand_8.png.meta
# meng_yao/Assets/animation/miner/masonry_man/miner_stand_9.png
# meng_yao/Assets/animation/miner/masonry_man/miner_stand_9.png.meta
# meng_yao/Assets/miner/masonry_man/miner_dig_2.png.meta
# meng_yao/Assets/miner/masonry_man/miner_dig_3.png.meta
# meng_yao/Assets/miner/masonry_man/miner_dig_4.png.meta
# meng_yao/Assets/miner/masonry_man/miner_dig_5.png.meta
# meng_yao/Assets/miner/masonry_man/miner_move_2.png.meta
# meng_yao/Assets/miner/masonry_man/miner_move_3.png.meta
# meng_yao/Assets/miner/masonry_man/miner_move_4.png.meta
# meng_yao/Assets/miner/masonry_man/miner_move_5.png.meta
# meng_yao/Assets/miner/masonry_man/miner_stand_2.png.meta
# meng_yao/Assets/miner/masonry_man/miner_stand_3.png.meta
# meng_yao/Assets/miner/masonry_man/miner_stand_4.png.meta
# meng_yao/Assets/miner/masonry_man/miner_stand_5.png.meta
|
2024-10-25 23:54:16 +08:00 |
|
|
|
3eadf6a0c1
|
动画提交
|
2024-10-25 21:55:00 +08:00 |
|
|
|
9e7334d512
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-25 20:04:36 +08:00 |
|
|
|
93f8a3dfd8
|
add
|
2024-10-25 19:14:26 +08:00 |
|
hyskai
|
45ed17d777
|
add
|
2024-10-25 19:14:25 +08:00 |
|
hyskai
|
f39fa7c9c3
|
add
|
2024-10-25 15:39:27 +08:00 |
|
hyskai
|
c374ce6346
|
add
|
2024-10-24 22:11:23 +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 |
|
hyskai
|
9412e30a3b
|
add
|
2024-10-24 16:10:18 +08:00 |
|
hyskai
|
03ccd98561
|
add
|
2024-10-24 15:52:42 +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 |
|
|
|
f4d43eafcf
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-24 09:12:38 +08:00 |
|
hyskai
|
9a8b0d3e56
|
add
|
2024-10-24 09:11:20 +08:00 |
|
|
|
c11754b0f1
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-24 09:05:53 +08:00 |
|
hyskai
|
ef8f871210
|
add
|
2024-10-23 20:53:18 +08:00 |
|
|
|
f3874dda7e
|
Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
|
2024-10-23 19:38:16 +08:00 |
|
hyskai
|
a274b9a71e
|
add
|
2024-10-23 19:37:45 +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 |
|
|
|
895f070015
|
add
|
2024-10-23 19:06:35 +08:00 |
|
hyskai
|
52415eac94
|
add
|
2024-10-23 17:10:04 +08:00 |
|
|
|
99c66ddd6f
|
add
|
2024-10-23 15:35:12 +08:00 |
|
|
|
7a2e678201
|
add
|
2024-10-22 22:26:05 +08:00 |
|
|
|
0802c6c6e8
|
add
|
2024-10-20 22:46:28 +08:00 |
|
|
|
69a1cb3f8b
|
排行榜
|
2024-10-20 21:57:46 +08:00 |
|
hyskai
|
911d7c52c5
|
add
|
2024-10-20 21:39:16 +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
|
04678a3358
|
add
|
2024-10-20 19:54:05 +08:00 |
|
hyskai
|
4ca822aa60
|
add
|
2024-10-20 18:29:41 +08:00 |
|
