wulongxiao/_xiaofang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
318 Commits 1 Branch 0 Tags 1.6 GiB
7e7c986885
Commit Graph

316 Commits

Author SHA1 Message Date
lq
22f3b964c9 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-11 16:00:12 +08:00
huyulong
480d7d6338 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 
# Conflicts:
#	xiaofang/Assets/Script/UI/TemplateInfo.cs
 2024-12-11 15:58:15 +08:00
huyulong
48f4c0dc98 UI相关文件，以及Language表更新 2024-12-11 15:55:46 +08:00
lq
5f5bc751f3 修改 2024-12-11 15:53:49 +08:00
lq
e0ef89a8cf 修改 2024-12-11 15:50:06 +08:00
lq
56174ab2ff 修改 2024-12-11 15:35:11 +08:00
huyulong
e50511e1d7 Taskjson文件的读取和部分UI脚本 2024-12-11 15:27:54 +08:00
liuliang
d606df27e0 逻辑写一半ProMax 2024-12-11 14:37:42 +08:00
huyulong
7506bda817 UI相关逻辑 2024-12-11 14:24:06 +08:00
huyulong
827332bcaa Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-11 11:15:47 +08:00
HuangZiBo
b5e67fdb51 小改 2024-12-11 11:15:20 +08:00
huyulong
e0275fd030 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-11 11:11:01 +08:00
huyulong
b66fe5fb38 FreePanel01相关UI逻辑 2024-12-11 11:10:48 +08:00
HuangZiBo
5cece435ae 玩家列表接口 2024-12-11 11:01:36 +08:00
lq
158082ec63 疏散人群公布弹窗修改 2024-12-11 01:32:11 +08:00
lq
0b05e7d0ef 修改 2024-12-10 23:24:15 +08:00
lq
94eb75df55 人员窗口弹窗 2024-12-10 21:34:19 +08:00
lq
7f831f0862 疏散人群公布修改 2024-12-10 18:14:08 +08:00
lq
96ba512839 界面隐藏 2024-12-10 15:02:05 +08:00
lq
307c28637b 主测试场景更改 2024-12-10 14:28:28 +08:00
lq
aaf0eb1408 疏散人群公布UI逻辑修改 2024-12-10 08:05:28 +08:00
龚世杰
a349a1ee86 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang into main 2024-12-10 06:21:18 +08:00
龚世杰
f035248e44 界面 2024-12-10 06:20:20 +08:00
huyulong
7741141765 UI变动 2024-12-10 06:11:25 +08:00
龚世杰
751e369ed8 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang into main 2024-12-10 05:55:41 +08:00
huyulong
cc4315acbd 自由行动14UI完成 2024-12-10 05:50:29 +08:00
huyulong
977b4cd7d0 自由移动场景14 2024-12-10 05:16:49 +08:00
龚世杰
4c19dc9395 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang into main 2024-12-10 02:55:18 +08:00
huyulong
e89ba36f44 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-10 02:43:02 +08:00
huyulong
73ba252e4f 新增UI场景和相关图片 2024-12-10 02:42:52 +08:00
liuliang
b3c3c8cda7 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-10 02:40:37 +08:00
liuliang
ad14e3f646 小智搞的!!!不是魅魔!!!!!,做完了指令行动UI了,还差逻辑 2024-12-10 02:40:30 +08:00
龚世杰
d9defe9230 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang into main 2024-12-10 00:43:05 +08:00
龚世杰
0981a8241d 一 2024-12-10 00:42:57 +08:00
huyulong
52b576f39b tip界面UI 2024-12-10 00:32:43 +08:00
huyulong
c0a4c6638b Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-10 00:01:17 +08:00
liuqingqing
d2f870bb12 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-10 00:00:05 +08:00
liuqingqing
025221011a 主持人界面UI的制作完成 2024-12-09 23:59:47 +08:00
huyulong
b2889a0eb6 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-09 23:54:26 +08:00
huyulong
c131c50fe4 两个UI场景 2024-12-09 23:54:17 +08:00
lq
5db2740f34 应急人员配置数据串联 2024-12-09 23:53:38 +08:00
liuliang
441a9a200c Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-09 23:28:34 +08:00
liuliang
cde58b2894 小智做的不是刘亮!!!!!!!指令行动1-7,有些在同一个panel里 2024-12-09 23:28:21 +08:00
龚世杰
f6ac4bd6bd Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang into main 2024-12-09 23:18:03 +08:00
龚世杰
f0000064bb add 2024-12-09 23:17:47 +08:00
huyulong
ca14e5e3cb 第二个UI场景 2024-12-09 22:47:49 +08:00
huyulong
b987f7f540 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-09 21:26:22 +08:00
liuqingqing
93583c39e2 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-09 21:25:26 +08:00
liuqingqing
21790b3aae 提交主持人界面的UI 2024-12-09 21:24:46 +08:00
huyulong
4c6485629c add自由移动02场景 2024-12-09 21:23:31 +08:00
liuliang
914c20306c Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-09 21:22:54 +08:00
liuliang
a1698498ab 下拉框 2024-12-09 21:22:46 +08:00
huyulong
7cc351f404 场景的UI图片 2024-12-09 20:29:52 +08:00
huyulong
1011de6d2d 自由行动第一个UI 2024-12-09 19:42:46 +08:00
liuliang
d8e5ca443e Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-09 15:37:24 +08:00
liuliang
ddfaf5715e 火灾指令式行动场景搭建 2024-12-09 15:37:08 +08:00
huyulong
d5ad76e1d6 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-09 15:35:44 +08:00
huyulong
9cbee4b513 自由行动相关UI的添加和场景的创建 2024-12-09 15:35:32 +08:00
lq
051cfed454 事件数据传输修改 2024-12-09 14:20:37 +08:00
lq
6ee036b478 数据传输更改 
数据传输更改
 2024-12-09 14:12:43 +08:00
huyulong
1200fb2dc8 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-09 11:57:03 +08:00
huyulong
e170fc08c3 Select表的添加和读取 2024-12-09 11:56:53 +08:00
lq
53f0e64108 更改为测试版本 2024-12-09 11:37:36 +08:00
huyulong
d10d3775d8 proto文件修改以及npc寻路 2024-12-09 11:30:15 +08:00
lq
0462282d61 PanelToggle更改 2024-12-09 11:09:39 +08:00
lq
4a1837a740 选择剧本更改 2024-12-09 09:53:48 +08:00
huyulong
39920f011c Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-09 09:47:03 +08:00
huyulong
e4c0491f53 任务栏的按钮调整 2024-12-09 09:46:52 +08:00
lq
cf40583796 修改 2024-12-08 14:13:31 +08:00
lq
e2f480b1ea 修改 2024-12-07 17:47:46 +08:00
lq
d04be15484 消防接口数据传输 2024-12-07 16:18:15 +08:00
huyulong
957e7cc035 add 2024-12-06 18:08:56 +08:00
huyulong
e4f4fdf66e add 2024-12-06 17:43:38 +08:00
huyulong
33c0586519 boy1材质和贴图 2024-12-06 17:24:23 +08:00
huyulong
00c4e2bc74 测试boy模型完毕，动作可用 2024-12-06 16:43:56 +08:00
huyulong
76b7259a13 任务隐藏和显示的动画 2024-12-06 16:24:45 +08:00
lq
8bb12d1eb3 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-06 15:44:18 +08:00
lq
3d8b063137 场景选中事件出现 2024-12-06 15:43:36 +08:00
huyulong
44a81c31a7 人物受伤屏幕闪红 2024-12-06 15:15:30 +08:00
huyulong
83353b4aeb Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-06 11:52:21 +08:00
huyulong
a8dbfec82d 任务显示修复 2024-12-06 11:52:15 +08:00
lq
93501dd2b0 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-06 11:38:00 +08:00
lq
b383d7bf89 JSONReader覆盖 2024-12-06 11:37:41 +08:00
huyulong
3dd80a3816 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-06 11:29:32 +08:00
huyulong
8729b82472 任务相关逻辑，以及任务显示逻辑 2024-12-06 11:29:20 +08:00
lq
1f5c12cde9 BUG更改 2024-12-05 23:10:33 +08:00
lq
e03032830a bug修改 2024-12-05 20:33:37 +08:00
huyulong
47787b8bfd 任务接口和相关函数 2024-12-05 20:21:15 +08:00
lq
feda86e6c3 Bug修改 2024-12-05 17:56:33 +08:00
huyulong
9598202d0f 新的接口接入 2024-12-05 17:38:33 +08:00
huyulong
7496a6effd 更新common文件，将相关proto文件移到项目中，任务系统UI和json读取 2024-12-05 16:31:46 +08:00
lq
cecf3989b3 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-05 15:39:20 +08:00
lq
effc389683 选择场景数据串联更改 2024-12-05 15:39:10 +08:00
huyulong
13f74a2139 add 2024-12-05 09:21:07 +08:00
lq
1d623866c4 Language设置 2024-12-04 22:58:31 +08:00
huyulong
46ec56f0f6 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-04 16:40:59 +08:00
huyulong
3e3888fb9c 扣血逻辑 2024-12-04 16:40:48 +08:00
lq
2454ea9555 应急人员配置点击变色更改 2024-12-04 16:37:51 +08:00
huyulong
358701471d 增加了common文件夹 2024-12-04 15:26:46 +08:00
huyulong
df819a7e54 更改ProtoBuffer相关文件位置 2024-12-04 15:10:27 +08:00