update

.gitattributes

@@ -33,3 +33,5 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
 *.zip filter=lfs diff=lfs merge=lfs -text
 *.zst filter=lfs diff=lfs merge=lfs -text
 *tfevents* filter=lfs diff=lfs merge=lfs -text
+assets/logo.png filter=lfs diff=lfs merge=lfs -text
+assets/overall.jpg filter=lfs diff=lfs merge=lfs -text

assets/example_texture/text_prompts.txt

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 assets/example_texture/meshes/robot.obj \ 写实风格机甲3D模型，主体色调为米色和深灰色，机甲结构带有机械细节和磨损痕迹
 assets/example_texture/meshes/robot.obj \ 写实风格机甲3D模型，主体色调为深灰色和荧光黄，机甲结构带有机械细节和磨损痕迹
 assets/example_texture/meshes/robot_text.obj \ 举着牌子的红色写实风格机器人，牌子上写着“Hello”的文字
@@ -22,3 +23,29 @@ assets/example_texture/meshes/clock.obj \ 木质闹钟，黑色指针，显示
 assets/example_texture/meshes/clock.obj \ 黑色闹钟搭配复古罗马数字表盘，古典韵味
 assets/example_texture/meshes/table2.obj \ 一套现代简约风格的灰色方桌和四把木质椅子，桌面呈现光滑的哑光质感
 assets/example_texture/meshes/table2.obj \ 一套现代简约风格的青色方桌和四把蓝色木质椅子，桌面呈现光滑的哑光质感
+=======
+apps/assets/example_texture/meshes/robot.obj \ 写实风格机甲3D模型，主体色调为米色和深灰色，机甲结构带有机械细节和磨损痕迹
+apps/assets/example_texture/meshes/robot.obj \ 写实风格机甲3D模型，主体色调为深灰色和荧光黄，机甲结构带有机械细节和磨损痕迹
+apps/assets/example_texture/meshes/robot_text.obj \ 举着牌子的红色写实风格机器人，牌子上写着“Hello”的文字
+apps/assets/example_texture/meshes/robot_text.obj \ 举着牌子的彩色写实风格机器人，牌子上写着“World”的文字
+apps/assets/example_texture/meshes/robot_text.obj \ 举着木质牌子的写实风格机甲3D模型，主体红色，牌子上写着“中国”的文字
+apps/assets/example_texture/meshes/robot_text.obj \ 举着牌子的黄色写实风格机器人，牌子上画着爱心
+apps/assets/example_texture/meshes/horse.obj \ 具有古典质感、鬃毛飞扬的棕色马首，黑色眼睛
+apps/assets/example_texture/meshes/horse.obj \ 具有古典质感、鬃毛飞扬的栗色马首
+apps/assets/example_texture/meshes/electric_drill.obj \ 电动手钻，有磨损细节，灰色红色相间磨砂质感哑光外壳
+apps/assets/example_texture/meshes/electric_drill.obj \ 电动手钻，有磨损细节，黄蓝色哑光外壳带有磨砂质感
+apps/assets/example_texture/meshes/chair.obj \ 具有大理石材质框架，坐垫为柔软青色织物纹理的旋转吧台椅
+apps/assets/example_texture/meshes/chair.obj \ 具有桃木色木质框架，坐垫为柔软灰色织物纹理的旋转吧台椅
+apps/assets/example_texture/meshes/vase.obj \ 瓶身上绘有彩色飞鸟图案的花瓶
+apps/assets/example_texture/meshes/vase.obj \ 陶土花瓶
+apps/assets/example_texture/meshes/globe.obj \ 木质底座的经纬线地球仪
+apps/assets/example_texture/meshes/flashlight.obj \ 筒橡胶防滑纹路，红色磨砂质感的手电筒
+apps/assets/example_texture/meshes/bed.obj \ 简约现代风格的双人床，铺着灰色被子，上面摆放着几个红色的抱枕
+apps/assets/example_texture/meshes/bed.obj \ 北欧风格的双人床，浅灰色床单上面摆放着几个紫色的抱枕
+apps/assets/example_texture/meshes/desk.obj \ 欧式风格木质梳妆台及配套凳子
+apps/assets/example_texture/meshes/desk.obj \ 白色带抽屉和镜子的欧式风格梳妆台及配套凳子模型，添加金色装饰细节
+apps/assets/example_texture/meshes/clock.obj \ 木质闹钟，黑色指针，显示时间为数字
+apps/assets/example_texture/meshes/clock.obj \ 黑色闹钟搭配复古罗马数字表盘，古典韵味
+apps/assets/example_texture/meshes/table2.obj \ 一套现代简约风格的灰色方桌和四把木质椅子，桌面呈现光滑的哑光质感
+apps/assets/example_texture/meshes/table2.obj \ 一套现代简约风格的青色方桌和四把蓝色木质椅子，桌面呈现光滑的哑光质感
+>>>>>>> ba612642c65af2510cc9cf4a74fc0cc1270b8812