Compare commits

base: yxm:main

Branches Tags

yxm:main yxm:V260 yxm:v330 yxm:V290

...

compare: yxm:c2fc534b83df1ac1f4d3c025d186333adec4c92a

Branches Tags

yxm:V260 yxm:v330 yxm:main yxm:V290

17 Commits

main ... c2fc534b83

Author	SHA1	Message	Date
yangliflora	c2fc534b83	Merge branch 'v330' of http://139.129.35.87:3000/yxm/TerracottaWarriors into v330 ... # Conflicts: # Content/QSH_QiJu/QiJuNear280.umap resolved by origin/v330(远端) version	2025-07-16 20:40:41 +08:00
yangliflora	28b5b1dc6c	虎符鸟位置，长明灯鸟位置，弓弩鸟位置，咸阳城鸟位置，水晶不消失	2025-07-16 20:39:40 +08:00
910370352	2b558b2c22	棋局玄鸟位置	2025-07-16 20:31:29 +08:00
yangliflora	58a7e93f36	更新hiddeactor	2025-07-16 18:09:03 +08:00
yangliflora	f5229fe9e4	修改大殿seq,改为一个视频	2025-07-16 17:55:07 +08:00
yangliflora	1c653178e7	大殿sequence，长廊门修改位置，棋局增加灯	2025-07-16 17:43:11 +08:00
910370352	b0bd13633d	开场待机，长廊待机	2025-07-16 14:47:14 +08:00
910370352	64aafb42fb	修改弓弩的飞翔位置	2025-07-16 05:06:39 +08:00
910370352	1dd678c10d	玄鸟说话	2025-07-16 04:58:28 +08:00
910370352	8952c7416b	多人系统的角色材质和名字大小	2025-07-16 03:11:33 +08:00
910370352	9bd84e4972	兵佣，机械龙位置，	2025-07-16 02:52:50 +08:00
910370352	ff5a9a07e4	玄鸟位置	2025-07-15 21:51:35 +08:00
910370352	ff46d7ef53	修改所有玄鸟的sequence	2025-07-15 18:07:48 +08:00
yangliflora	10d0581887	cube材质	2025-07-15 15:11:39 +08:00
yangliflora	b46b2805b8	330两个场景的播放视频的球体更换	2025-07-15 14:50:11 +08:00
yangliflora	2dad95b0cf	匹配330	2025-07-15 14:22:29 +08:00
yang	9267b460fa	删除秦始皇测试	2025-07-15 09:08:03 +08:00

155 changed files with 356 additions and 197 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Expand all files Collapse all files

BIN

Content/Blueprint/VRInstance.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/DaDian/Level/dadainjinjing280.umap (Stored with Git LFS)

Binary file not shown.

BIN

Content/DaDian/Sequence/280/Se_DD_End280.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/DaDian/Sequence/280/Se_DD_End280Copy.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/DaDian/Sequence/280/Se_DD_Start280.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/DaDian/Sequence/280/Se_DD_Start280Copy.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/DaDian/Sequence/280/Se_DD_Start280Copydaiji.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/DaDian/Sequence/280/Se_dd_ZONG.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Mesh/ChangDi/3_-_Default.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Mesh/ChangDi/Material_008.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Mesh/ChangDi/Material_010.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Mesh/ChangDi/Material_013.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Mesh/Culture/SM_QSH.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Mesh/Material/zhuan_COLOR_Mat_Inst1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Mesh/Material/zhuan_COLOR_Mathff16.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Mesh/Material/zhuan_COLOR_Mathff_4.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Mesh/Material/zhuan_COLOR_sss1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Mesh/Material/zhuan_COLOR_sss2_Inst.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Mesh/Material/zhuan_KaichangBase.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Mesh/Material/zhuan_kaichang.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Mesh/Material/zhuan_kaichang_Inst.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Mesh/OpacityMan/M_OpaDefault.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_Bingyong/BingyongNear280.umap (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_Bingyong/SM_MERGED_StaticMeshActor_18.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/QSH_Bingyong/SM_MERGED_StaticMeshActor_76.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/QSH_Bingyong/Sequence/280/SE_BingYong04Copy280.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_Bingyong/Sequence/280/SE_BingYong07Copy280.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_Bingyong/Sequence/280/SE_BingYong08Copy280.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_Bingyong/Sequence/280/SE_BingYong09Copy280.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_Bingyong/T_Dimian_COLOR.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/QSH_Bingyong/T_Dimian_NRM.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/QSH_Bingyong/diban.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/QSH_Bingyong/hulan.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/QSH_Bingyong/hulan1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/QSH_Bingyong/hulan2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/QSH_Bingyong/langan.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/QSH_Bingyong/lvzhuan_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/QSH_Bingyong/lvzhuan_Normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/QSH_Bingyong/rock_tile_floor_diff_2k.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/QSH_Bingyong/ta.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/QSH_Bingyong/tai01_SM_MERGED_StaticMeshActor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/QSH_Bingyong/tai01_SM_MERGED_StaticMeshActor1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/QSH_Bingyong/tai01_SM_MERGED_StaticMeshActor3.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/QSH_Bingyong/tai01_SM_MERGED_StaticMeshActor4.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/QSH_Bingyong/tai01_SM_MERGED_StaticMeshActor5.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/QSH_Bingyong/tai01_SM_MERGED_StaticMeshActor6.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/QSH_Bingyong/tai01_SM_MERGED_StaticMeshActor7.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/QSH_Bingyong/tai01_SM_MERGED_StaticMeshActor8.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/QSH_Bingyong/taijie.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/QSH_Bingyong/zhuan.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/QSH_Bingyong/zhuan_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/QSH_Bingyong/zhuan_Normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/QSH_ChangLang/L_ChangLang280.umap (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_ChangLang/Se/280/Se_CL_EndCopy280.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_ChangLang/Se/280/Se_CL_InteractionCopy280.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_ChangLang/Se/280/Se_CL_StandByCopy280.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_ChangLang/Se/280/Se_CL_StandByCopy280daiji.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/QSH_ChangLang/Se/280/Se_CL_startCopy280.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_ChangLang/Se/280/Se_CL_start_02Copy280.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_ChangLang/Se/280/Se_CL_start_02Copy280daiji.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_ChangLang/Se/280/sub/Se_light280.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_ChangLang/Se/280/sub/Se_shibie280_05.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_ChangLang/Se/280/sub/Se_shibie280_06.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_ChangLang/Se/280/sub/Se_shibie280_07.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_ChangLang/Se/280/sub/Se_shibie280_08.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_JiGuang/Squencer/280/01jiannu_01-10Copy280.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_JiGuang/Squencer/280/01jiannu_01-10Copy280daiji.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_JiGuang/Squencer/280/03jiannu_11-12Copy280.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_JiGuang/Squencer/jiguangzhen/子序列280/jianyu1280.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_JiGuang/Squencer/jiguangzhen/子序列280/jianyu280.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_JiGuang/Squencer/jiguangzhen/子序列280/jianyu_chuanyue280.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_JiGuang/jiguangzhen280.umap (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_KaiChang/280/1kaichang280.umap (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_KaiChang/Mesh/BasicShapeMaterial.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/QSH_KaiChang/Mesh/Cube5.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/QSH_KaiChang/Mesh/Cube7.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/QSH_KaiChang/Mesh/zhuzi.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_KaiChang/Sequence/280/SE_kaichang01Copy280.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_KaiChang/Sequence/280/SE_kaichang02Copy280.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_KaiChang/Sequence/280/SE_kaichang03Copy280+.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_KaiChang/Sequence/280/SE_kaichang03Copy280.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_KaiChang/Sequence/280/SE_kaichang04Copy280.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_QiJu/QiJuNear280.umap (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_QiJu/Sequence/280/SE_QiJu01Copy280.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_QiJu/Sequence/280/SE_QiJu02Copy280.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_QiJu/Sequence/280/SE_QiJu03Copy280.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_QiJu/Sequence/280/SE_QiJu04Copy280.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_QiJu/Sequence/280/SE_QiJu05Copy280.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_QiJu/Sequence/280/SE_QiJu05Copy280_2.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_QiJu/Sequence/280/SE_QiJu06Copy280.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_XianYangCheng/MAPs/xianyangchengshangkong.umap (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_XianYangCheng/Squencer/xianyangcheng/xianyangchengCopy.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_XianYangCheng/movieplane.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_XianYangCheng/sphere_test2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/QSH_jixielong/Dragon.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_jixielong/M_Dragon.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_jixielong/Squencer/280/1canbaoge_01-07Copy280.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_jixielong/Squencer/280/2canbaoge_daijiCopy280.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_jixielong/Squencer/280/3canbaoge_buchongCopy280.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/QSH_jixielong/Squencer/280/4canbaoge_11Copy280.uasset (Stored with Git LFS)

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More