yxm/TerracottaWarriors
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: yxm:main
Branches Tags
yxm:main yxm:V260 yxm:v330 yxm:V290
..
compare: yxm:c8ffe4ecd2c44627c051e669401a52011069dc05
Branches Tags
yxm:V260 yxm:v330 yxm:main yxm:V290

29 Commits
main ... c8ffe4ecd2

Author SHA1 Message Date
910370352
c8ffe4ecd2 修改了网段，咸阳城的鸟和片，修改玄鸟说话动画 2025-07-18 19:48:21 +08:00
910370352
9ece7e1fe7 去掉帧率显示，修改长廊的地面隐藏tag，修改机械龙的sequence 2025-07-18 18:33:06 +08:00
910370352
87a056e331 修改机械龙的5 5待机 7的鸟的衔接 2025-07-18 17:13:48 +08:00
910370352
b3869acd6c 长廊特效，棋局分布，激光两个石头位置，兵佣鸟的位置，角色透明度 2025-07-18 17:04:21 +08:00
910370352
6713a11638 删除火炬，长廊碰撞， 2025-07-18 16:12:58 +08:00
910370352
d068ae5419 虎符和机械龙循环序列 2025-07-17 03:54:06 +08:00
910370352
ce108c8208 修正场景中模型位置 2025-07-17 03:13:32 +08:00
910370352
6398d3a289 调整场景中的模型位置以匹配场景 2025-07-17 02:17:01 +08:00
910370352
720cfd28ca 棋局修改 2025-07-17 00:53:37 +08:00
910370352
f3d485586a 场景位置调整 2025-07-17 00:46:53 +08:00
yangliflora
a9eebc9ddf 修改最后的语音 金乌绕日 2025-07-16 22:03:40 +08:00
yangliflora
0d0df90fe4 长廊特效修改，弩箭多余方框删除 2025-07-16 21:46:18 +08:00
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
200 changed files with 440 additions and 322 deletions
Expand all files Collapse all files

6
.gitignore vendored
View File

@ -74,8 +74,4 @@ Plugins/*/Intermediate/*
# Cache files for the editor to use
DerivedDataCache/*
.idea/.idea.Erosion/.idea/git_toolbox_prj.xml
/.idea
.vsconfig
TerracottaWarriors.sln.DotSettings.user
UpgradeLog.htm
新建 文本文档.txt
/.idea

5
Config/DefaultEngine.ini
View File

@ -124,7 +124,6 @@ r.DynamicGlobalIlluminationMethod=1
r.ReflectionMethod=1
r.Shadow.Virtual.Enable=1
r.Mobile.SupportGPUScene=False
[/Script/HardwareTargeting.HardwareTargetingSettings]
TargetedHardwareClass=Mobile
@ -183,12 +182,12 @@ SoundCueCookQualityIndex=-1
[/Script/AndroidRuntimeSettings.AndroidRuntimeSettings]
PackageName=com.vortexing.[PROJECT]
StoreVersion=103
StoreVersion=1
StoreVersionOffsetArmV7=0
StoreVersionOffsetArm64=0
StoreVersionOffsetX8664=0
ApplicationDisplayName=
VersionDisplayName=1.0.3
VersionDisplayName=1.0
MinSDKVersion=23
TargetSDKVersion=25
InstallLocation=InternalOnly

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Content/DaDian/Sequence/280/Se_DD_Zong.uasset (Stored with Git LFS)
View File

Binary file not shown.

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

Binary file not shown.

BIN
Content/Effect/chuansuo/NS_Chongdong.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/chuansuo/NS_Chongdong_mishi1.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/MapTrackMarkers/Effects/P_Marker_bingyong1.uasset (Stored with Git LFS)
View File

Binary file not shown.

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

Binary file not shown.

BIN
Content/Mesh/ChangDi/Material_007.uasset (Stored with Git LFS)
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Content/Mesh/Material/Flora/MI_zhuan01_zhuzi.uasset (Stored with Git LFS)
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Content/Mesh/Material/zhuan_COLOR_sss2_Inst.uasset (Stored with Git LFS)
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Content/Mesh/OpacityMan/M_OpaDefault_Inst.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Mesh/Texture/T_Dimian_COLOR.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Mesh/Texture/T_Dimian_NRM.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Mesh/Texture/T_Dimian_OCC.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Mesh/Texture/T_Dimian_SPEC.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Mesh/Texture/T_fuwen.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Mesh/Texture/T_wall_COLOR.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Mesh/Texture/T_wall_DISP.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Mesh/Texture/T_wall_NRM.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Mesh/Texture/T_wall_OCC.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Mesh/Texture/T_wall_SPEC.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Mesh/Texture/zhuan3_COLOR.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Mesh/Texture/zhuan3_DISP.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Mesh/Texture/zhuan3_NRM.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Mesh/Texture/zhuan3_OCC.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Mesh/Texture/zhuan3_SPEC.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Mesh/Texture/zhuan_COLOR.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Mesh/Texture/zhuan_DISP.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Mesh/Texture/zhuan_NRM.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Mesh/Texture/zhuan_OCC.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Mesh/Texture/zhuan_SPEC.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Movies/TiHuan/XianYangEnd/XianYangCheng2MediaPlayer_Video_Mat.uasset (Stored with Git LFS)
View File

Binary file not shown.

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

Binary file not shown.

BIN
Content/QSH_Bingyong/SM_MERGED_StaticMeshActor_102.uasset (Stored with Git LFS)
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Content/QSH_Bingyong/Sequence/280/SE_BingYong03Copy280.uasset (Stored with Git LFS)
View File

Binary file not shown.

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

Binary file not shown.

BIN
Content/QSH_Bingyong/Sequence/280/SE_BingYong05Copy280.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/QSH_Bingyong/Sequence/280/SE_BingYong06Copy280.uasset (Stored with Git LFS)
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Content/QSH_ChangLang/Se/280/Se_CL_StandByCopy280daiji.uasset (Stored with Git LFS)
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Content/QSH_ChangLang/Se/280/sub/Se_TouchLighten280.uasset (Stored with Git LFS)
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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