Commit Graph

Select branches

Hide Pull Requests

3DBody

AnHui_BaoShi

AnHui_SheYing

LanZhou_FanYingJingLiu

LanZhou_HuaGong

LanZhou_ShiHua

LouDi_Pig

LouDi_Quan

NewMaster

ShuangHe_Math

main

Mono Color

• 3d23633e75 提交修改问题 Lihao7788 2025-03-13 13:23:20 +08:00
• d6ba79eafe 提交内容修改 Lihao7788 2025-03-13 10:30:34 +08:00
• beb13a3fdd 修改内容 Lihao7788 2025-03-13 10:30:01 +08:00
• 5478b55371 Merge branch '3DBody' of http://git.zxkedu.com:33769/shenjianxing/VirtualFramework into 3DBody shenjianxing 2025-03-13 09:19:48 +08:00
• 706f1bfd99 修改按钮 shenjianxing 2025-03-13 09:19:42 +08:00
• 1654247578 去掉场景中的渲染，添加骨链接内容 Lihao7788 2025-03-12 17:45:02 +08:00
• fdddc64b40 Merge branch '3DBody' of http://git.zxkedu.com:33769/JiNan/VirtualFramework into 3DBody Lihao7788 2025-03-12 17:08:26 +08:00
• 80d6400315 提交 高亮物体选择 内容填充 Lihao7788 2025-03-12 17:08:16 +08:00
• 558ac6e60e 修改逻辑 shenjianxing 2025-03-12 16:58:48 +08:00
• bcf96946b5 Merge branch '3DBody' of http://git.zxkedu.com:33769/shenjianxing/VirtualFramework into 3DBody shenjianxing 2025-03-12 16:25:29 +08:00
• b8fb6b87dc 修改UI shenjianxing 2025-03-12 16:25:21 +08:00
• 0cbbb52e62 填充骨骼大模块 部位高亮选择 Lihao7788 2025-03-12 15:33:26 +08:00
• fa7e8cd310 肌肉单独模块 Lihao7788 2025-03-12 15:04:26 +08:00
• f47d6abafa 添加实验说明标题 Cg-Fly 2025-03-12 14:50:49 +08:00
• b86bfdc4dc 分光镜动画修改 Cg-Fly 2025-03-12 14:30:15 +08:00
• be7d61f048 修正分光镜动画 Cg-Fly 2025-03-12 14:09:49 +08:00
• f33380f554 修改动画反馈 Cg-Fly 2025-03-12 13:31:42 +08:00
• 5629e4c17d 提交xml内容填充，大模块基础填充完毕 Lihao7788 2025-03-12 13:30:57 +08:00
• 4b8629937b 提交3d解刨内容表 Lihao7788 2025-03-12 11:39:22 +08:00
• 567c75197d 填充，骨链接，骨骼细分内容 Lihao7788 2025-03-12 10:21:58 +08:00
• dc45d5827c Merge branch '3DBody' of http://git.zxkedu.com:33769/JiNan/VirtualFramework into 3DBody Lihao7788 2025-03-11 17:59:21 +08:00
• f9f51ae4bf 提交内容修改 Lihao7788 2025-03-11 17:59:13 +08:00
• 5aa83b3708 Merge branch '3DBody' of http://git.zxkedu.com:33769/shenjianxing/VirtualFramework into 3DBody shenjianxing 2025-03-11 16:27:11 +08:00
• 850c450e0f 修改左侧UI shenjianxing 2025-03-11 16:27:06 +08:00
• 5596d827ef 提交3d解剖内容填充表 Lihao7788 2025-03-11 16:19:25 +08:00
• c626164e6b 合并 Lihao7788 2025-03-11 15:58:43 +08:00
• 4d0958cdc8 修改UI shenjianxing 2025-03-11 15:22:41 +08:00
• d4421a6ec8 Merge branch '3DBody' of http://git.zxkedu.com:33769/shenjianxing/VirtualFramework into 3DBody shenjianxing 2025-03-11 14:37:44 +08:00
• 54338fd969 Merge branch 'master' into 3DBody shenjianxing 2025-03-11 14:37:34 +08:00
• a4d328803b 修复bug shenjianxing 2025-03-11 14:37:17 +08:00
• ea54397753 合并 Lihao7788 2025-03-11 14:11:24 +08:00
• a2df947b2e 提交修改 Lihao7788 2025-03-11 14:10:38 +08:00
• 644f8ca670 Merge branch '3DBody' of http://git.zxkedu.com:33769/shenjianxing/VirtualFramework into 3DBody shenjianxing 2025-03-11 14:00:05 +08:00
• ad5bcb59de Merge branch 'master' into 3DBody shenjianxing 2025-03-11 13:59:53 +08:00
• f1d865dc81 修改bug shenjianxing 2025-03-11 13:59:38 +08:00
• 9842989d6f 添加meshCollider Lihao7788 2025-03-11 13:16:44 +08:00
• ab77d101bb 修改相机参数设置 Lihao7788 2025-03-11 13:14:12 +08:00
• 4c3a422f61 提交内容修改，提交场景模型修改，相机参数设置，xm表内容填充 Lihao7788 2025-03-11 13:04:58 +08:00
• 469f3d71ee 珠宝补充场景烘焙 PengHao 2025-03-11 10:49:45 +08:00
• 788e8d72b5 增加模块退出事件监听 shenjianxing 2025-03-11 10:33:07 +08:00
• 43896403b7 修改3d解刨材质球 Lihao7788 2025-03-10 17:35:41 +08:00
• 2e0e17543a 修改注释 shenjianxing 2025-03-10 17:09:16 +08:00
• d10bd55f76 修改配置文档 shenjianxing 2025-03-10 17:08:23 +08:00
• da7c534bea Merge branch 'master' of http://git.zxkedu.com:33769/shenjianxing/VirtualFramework shenjianxing 2025-03-10 17:06:42 +08:00
• 0433dd7eff 修改Operation 切换相关逻辑 shenjianxing 2025-03-10 17:06:31 +08:00
• d679f7f50d 修改UI逻辑 shenjianxing 2025-03-10 17:06:07 +08:00
• e7a6837c40 修改切换operation列表自动开启 不需要主动Next shenjianxing 2025-03-10 17:05:35 +08:00
• 1b232fd2f8 修改模型材质球，添加娄底示例表内容 Lihao7788 2025-03-10 17:05:22 +08:00
• 2ed263a254 上传美术资源 shenjianxing 2025-03-10 16:12:48 +08:00
• a6b4d46cfc 添加宝石贴图 Lihao7788 2025-03-10 15:32:27 +08:00
• 4705a3e4fb 提交图片修改，UI任务里高亮颜色修改 Lihao7788 2025-03-10 14:19:38 +08:00
• f4113f80cf 添加制作模块TextTip,实验说明文字 Lihao7788 2025-03-10 11:17:20 +08:00
• 54e959659a 修改宝石琢磨加工部分内容 Lihao7788 2025-03-10 10:59:08 +08:00
• 78dc4176a6 Merge branch 'AnHui_BaoShi' of http://git.zxkedu.com:33769/JiNan/VirtualFramework into AnHui_BaoShi Lihao7788 2025-03-10 10:42:44 +08:00
• 6867fdb14e 修改黄金模块，分数表内容 Lihao7788 2025-03-10 10:42:35 +08:00
• e418481e61 Merge branch 'AnHui_BaoShi' of http://git.zxkedu.com:33769/JiNan/VirtualFramework into AnHui_BaoShi Cg-Fly 2025-03-10 10:09:38 +08:00
• 3ff93205e7 修改分光镜动画眼睛 Cg-Fly 2025-03-10 10:09:21 +08:00
• c174cb8466 修改3个模块步骤标题 Lihao7788 2025-03-10 09:46:41 +08:00
• e166aedcfc Merge branch 'AnHui_BaoShi' of http://git.zxkedu.com:33769/JiNan/VirtualFramework into AnHui_BaoShi Lihao7788 2025-03-10 09:35:30 +08:00
• 5b271ffe26 修改提示，文字排序朝向 Lihao7788 2025-03-10 09:35:24 +08:00
• f71369ae51 Merge branch 'AnHui_BaoShi' of http://git.zxkedu.com:33769/JiNan/VirtualFramework into AnHui_BaoShi Cg-Fly 2025-03-10 09:28:34 +08:00
• 4692296bc8 添加宝石相关图片 Cg-Fly 2025-03-10 09:26:57 +08:00
• 583d3ee97f Merge branch 'AnHui_BaoShi' of http://git.zxkedu.com:33769/JiNan/VirtualFramework into AnHui_BaoShi Lihao7788 2025-03-10 09:08:25 +08:00
• a9a01f6020 修改打包，引用问题，打AB包，修改渲染图场景 Lihao7788 2025-03-10 09:08:12 +08:00
• d4a7a737a6 修改分光镜场景模型 Cg-Fly 2025-03-10 09:06:24 +08:00
• 5678006d89 修改珠宝鉴定工作台 Lihao7788 2025-03-09 20:18:48 +08:00
• c915af4601 完善两个展示模块内容 Lihao7788 2025-03-09 19:33:33 +08:00
• d4ad7db8d4 提交修改 Lihao7788 2025-03-08 18:27:09 +08:00
• e501f542e4 提交珠宝工作台内容 Lihao7788 2025-03-08 18:26:03 +08:00
• 4eef5bffa9 提交内容 Lihao7788 2025-03-08 18:10:22 +08:00
• 0fddf838c6 提交内容修改 Lihao7788 2025-03-08 18:06:00 +08:00
• e2dace7496 Merge branch 'AnHui_BaoShi' of http://git.zxkedu.com:33769/JiNan/VirtualFramework into AnHui_BaoShi Lihao7788 2025-03-08 17:21:16 +08:00
• 07968c45bc 珠宝鉴定，展示场景，状态机内容填充 Lihao7788 2025-03-08 17:21:08 +08:00
• 546855d044 完善其他三个动画 Cg-Fly 2025-03-08 17:12:28 +08:00
• f48dd8de90 分光镜场景动画制作 Cg-Fly 2025-03-08 17:00:43 +08:00
• a2773f81d0 Merge remote-tracking branch 'origin/master' into AnHui_BaoShi Lihao7788 2025-03-08 16:04:37 +08:00
• b43b5625f6 提交修改内容，bug表基本修改完成 Lihao7788 2025-03-08 16:03:59 +08:00
• d3a6eaa882 增加空判断 shenjianxing 2025-03-08 14:42:45 +08:00
• f17388a90e Merge remote-tracking branch 'origin/master' into AnHui_BaoShi Lihao7788 2025-03-08 14:09:34 +08:00
• d6b0abd2ca 提交修改bug，UI预制体修改 Lihao7788 2025-03-08 14:08:20 +08:00
• 4e0106ff9f Merge branch 'master' into LouDi_Quan shenjianxing 2025-03-08 14:05:47 +08:00
• 4ab1a9a194 新增TextWindow 的 Action shenjianxing 2025-03-08 14:05:03 +08:00
• c1e2fdeed4 合并 Lihao7788 2025-03-08 13:19:46 +08:00
• 18944b0f8f Merge branch 'master' into LouDi_Quan shenjianxing 2025-03-08 13:16:03 +08:00
• 3cfa13795e 新增UIBackPack shenjianxing 2025-03-08 13:15:13 +08:00
• 5e0af963c2 删除日志 shenjianxing 2025-03-07 17:39:31 +08:00
• c8a3cd25ce 场景烘焙 shenjianxing 2025-03-07 17:38:35 +08:00
• bf34a2688a 根据反馈修改 shenjianxing 2025-03-07 17:32:03 +08:00
• 9d958a22d7 Merge branch 'LouDi_Quan' of http://git.zxkedu.com:33769/JiNan/VirtualFramework into LouDi_Quan PengHao 2025-03-07 17:24:33 +08:00
• 4f05d0d178 犬的场景烘焙美化 PengHao 2025-03-07 17:23:20 +08:00
• 0100c092e9 Merge branch 'AnHui_BaoShi' of http://git.zxkedu.com:33769/JiNan/VirtualFramework into AnHui_BaoShi Lihao7788 2025-03-07 17:01:28 +08:00
• 27c2c312a7 修改场景，水热法，修改UI，输入界面，文本提示界面 Lihao7788 2025-03-07 17:01:20 +08:00
• b0f7f7af06 偏光镜动画修改 Cg-Fly 2025-03-07 16:34:12 +08:00
• 28d28c09a1 根据反馈修改 shenjianxing 2025-03-07 16:33:50 +08:00
• 3205bf99b3 修改反馈内容几条 Lihao7788 2025-03-07 16:14:04 +08:00
• faceaae3a8 Merge branch 'master' into LouDi_Quan shenjianxing 2025-03-07 16:03:15 +08:00
• 90d289242f 新增Tools的位置设定 shenjianxing 2025-03-07 16:02:36 +08:00
• ba7656b001 Merge branch 'master' into LouDi_Quan shenjianxing 2025-03-07 15:19:14 +08:00
• faeb18b95e 增加texttip的背景透明度参数 shenjianxing 2025-03-07 15:18:20 +08:00
• b1682e11d0 增加滑动速度和乱序的设置 shenjianxing 2025-03-07 15:06:15 +08:00