OracleStudio/PrinceOfGlory
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
kridoo
2025-11-04 13:56:54 +08:00
parent 1a8de3a14a
commit 434fc18578
30 changed files with 29690 additions and 24699 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Bakery/ftGlobalStorage.asset
View File

@@ -792,7 +792,9 @@ MonoBehaviour:
- Assets/timeline_s06_zichan/v021/C9_1_z_rig/C9_1_z_rig3.fbx
- Assets/timeline_s06_zichan/v016/C9_1_z_rig/S6_C9_3_z_rig1.fbx
- Assets/timeline_s06_zichan/v016/C9_1_z_rig/S6_C9_3_z_rig.fbx
uvOverlapAssetList: 00000000ffffffff0101000000000000000000000000000000000000000000000000000001010000010100000101000001010000010100000101000001010000010100000101000001010000010100000101000001010000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000000000000101000001010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001010000010100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001010000010100000101000000000000010100000000000001010000000000000101000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
- Assets/timeline_S4_zichan/v014/C_hh_z/gou.fbx
- Assets/Res/Models/Props/Anims/s05_fbx_v001/manghetaofan/SM_B5_S5_08_S_rig2.fbx
uvOverlapAssetList: 00000000ffffffff01010000000000000000000000000000000000000000000000000000010100000101000001010000010100000101000001010000010100000101000001010000010100000101000001010000010100000000000000000000000000000000000000000000000000000000000001010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001010000000000000000000000000000000000000000000000000000000000000000000001010000010100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010100000101000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010100000101000001010000000000000101000000000000010100000000000001010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
xatlasWarningShown: 0
foundCompatibleSetup: 1
gpuName: NVIDIA GeForce RTX 4090

BIN
Assets/D5VR/TestResource/S1.mp4
View File

Binary file not shown.

1718
Assets/JGW/Vfx/Animation/S01_vfx_chuanyuemenTimeline.playable
View File

File diff suppressed because it is too large Load Diff

BIN
Assets/Res/Models/Props/Anims/s05_fbx_v001/manghetaofan/SM_B5_S5_08_S_rig.fbx
View File

Binary file not shown.

12
Assets/Res/Models/Props/Anims/s05_fbx_v001/manghetaofan/SM_B5_S5_08_S_rig.fbx.meta
View File

@@ -72,15 +72,15 @@ ModelImporter:
importPhysicalCameras: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
importCameras: 0
importLights: 0
nodeNameCollisionStrategy: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
weldVertices: 0
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
@@ -100,9 +100,9 @@ ModelImporter:
strictVertexDataChecks: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
normalImportMode: 1
tangentImportMode: 2
normalCalculationMode: 1
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0

4
Assets/Res/Prefab/Scene_00/Static.prefab
View File

@@ -942,8 +942,8 @@ Transform:
m_GameObject: {fileID: 3703927858472900734}
serializedVersion: 2
m_LocalRotation: {x: -0.1611974, y: -0.2117904, z: -0.035441548, w: 0.9632779}
m_LocalPosition: {x: -1.54, y: 16.96, z: 11.52}
m_LocalScale: {x: 25.4, y: 20, z: 1}
m_LocalPosition: {x: -1.54, y: 22.8, z: 11.52}
m_LocalScale: {x: 71.1, y: 26.3, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6126966345348385578}

882
Assets/Res/Prefab/Scene_01/Dynamic.prefab
View File

File diff suppressed because it is too large Load Diff

14
Assets/Res/Prefab/Scene_01/Static.prefab
View File

@@ -9998,6 +9998,7 @@ MonoBehaviour:
cathcAudio: {fileID: 0}
downAudio: {fileID: 0}
effectHideAndShowCtr: {fileID: 0}
childAnimator: {fileID: 0}
--- !u!1001 &1169564810110769126
PrefabInstance:
m_ObjectHideFlags: 0
@@ -10162,6 +10163,7 @@ MonoBehaviour:
cathcAudio: {fileID: 0}
downAudio: {fileID: 0}
effectHideAndShowCtr: {fileID: 0}
childAnimator: {fileID: 0}
--- !u!1001 &1546650670640510169
PrefabInstance:
m_ObjectHideFlags: 0
@@ -10410,6 +10412,7 @@ MonoBehaviour:
cathcAudio: {fileID: 0}
downAudio: {fileID: 0}
effectHideAndShowCtr: {fileID: 0}
childAnimator: {fileID: 0}
--- !u!1001 &1809128753317098216
PrefabInstance:
m_ObjectHideFlags: 0
@@ -11193,6 +11196,7 @@ MonoBehaviour:
cathcAudio: {fileID: 0}
downAudio: {fileID: 0}
effectHideAndShowCtr: {fileID: 0}
childAnimator: {fileID: 0}
--- !u!1001 &2794284958969934842
PrefabInstance:
m_ObjectHideFlags: 0
@@ -11918,6 +11922,7 @@ MonoBehaviour:
cathcAudio: {fileID: 0}
downAudio: {fileID: 0}
effectHideAndShowCtr: {fileID: 0}
childAnimator: {fileID: 0}
--- !u!1001 &3487182441296582632
PrefabInstance:
m_ObjectHideFlags: 0
@@ -12271,6 +12276,7 @@ MonoBehaviour:
cathcAudio: {fileID: 0}
downAudio: {fileID: 0}
effectHideAndShowCtr: {fileID: 0}
childAnimator: {fileID: 0}
--- !u!1001 &3936964924103069277
PrefabInstance:
m_ObjectHideFlags: 0
@@ -12712,6 +12718,7 @@ MonoBehaviour:
cathcAudio: {fileID: 0}
downAudio: {fileID: 0}
effectHideAndShowCtr: {fileID: 0}
childAnimator: {fileID: 0}
--- !u!1001 &4566056090075446832
PrefabInstance:
m_ObjectHideFlags: 0
@@ -13152,6 +13159,7 @@ MonoBehaviour:
cathcAudio: {fileID: 0}
downAudio: {fileID: 0}
effectHideAndShowCtr: {fileID: 0}
childAnimator: {fileID: 0}
--- !u!4 &5349920488741223109 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 149709620223548766, guid: d895af0291425f74a9697ae741627abb,
@@ -13519,6 +13527,7 @@ MonoBehaviour:
cathcAudio: {fileID: 0}
downAudio: {fileID: 0}
effectHideAndShowCtr: {fileID: 0}
childAnimator: {fileID: 0}
--- !u!4 &9175109421607299540 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3412344612199001957, guid: b9cac29984711984ebe4a62a013adcd6,
@@ -13683,6 +13692,7 @@ MonoBehaviour:
cathcAudio: {fileID: 0}
downAudio: {fileID: 0}
effectHideAndShowCtr: {fileID: 0}
childAnimator: {fileID: 0}
--- !u!4 &8534406898879250959 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3412344612199001957, guid: b9cac29984711984ebe4a62a013adcd6,
@@ -15272,6 +15282,7 @@ MonoBehaviour:
cathcAudio: {fileID: 0}
downAudio: {fileID: 0}
effectHideAndShowCtr: {fileID: 0}
childAnimator: {fileID: 0}
--- !u!4 &6704308515977371379 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3412344612199001957, guid: b9cac29984711984ebe4a62a013adcd6,
@@ -15650,6 +15661,7 @@ MonoBehaviour:
cathcAudio: {fileID: 0}
downAudio: {fileID: 0}
effectHideAndShowCtr: {fileID: 0}
childAnimator: {fileID: 0}
--- !u!4 &8924740174450806321 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 149709620223548766, guid: d895af0291425f74a9697ae741627abb,
@@ -15819,6 +15831,7 @@ MonoBehaviour:
cathcAudio: {fileID: 0}
downAudio: {fileID: 0}
effectHideAndShowCtr: {fileID: 0}
childAnimator: {fileID: 0}
--- !u!4 &5905184378746845507 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3412344612199001957, guid: b9cac29984711984ebe4a62a013adcd6,
@@ -15983,6 +15996,7 @@ MonoBehaviour:
cathcAudio: {fileID: 0}
downAudio: {fileID: 0}
effectHideAndShowCtr: {fileID: 0}
childAnimator: {fileID: 0}
--- !u!4 &8990173542097952933 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 149709620223548766, guid: d895af0291425f74a9697ae741627abb,

2717
Assets/Res/Prefab/Scene_04/Dynamic.prefab
View File

File diff suppressed because it is too large Load Diff

9750
Assets/Res/Prefab/Scene_05/Dynamic.prefab
View File

File diff suppressed because it is too large Load Diff

9896
Assets/Res/Prefab/Scene_05/Static.prefab
View File

File diff suppressed because it is too large Load Diff

2343
Assets/Res/Prefab/Scene_06/Dynamic.prefab
View File

File diff suppressed because it is too large Load Diff

2
Assets/Res/Sounds/Scene06/NPC_Scene06_WuDing.ogg.meta
View File

@@ -11,7 +11,7 @@ AudioImporter:
compressionFormat: 1
quality: 1
conversionMode: 0
preloadAudioData: 0
preloadAudioData: 1
platformSettingOverrides:
7:
serializedVersion: 2

7399
Assets/Res/Timelines/01_timeline.playable
View File

File diff suppressed because it is too large Load Diff

3122
Assets/Res/Timelines/06_timeline.playable
View File

File diff suppressed because it is too large Load Diff

12
Assets/Scenes/Old/Launcher.unity
View File

@@ -4479,7 +4479,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
_isOffline: 1
NextSceneId: 10003
NextSceneId: 10000
--- !u!1001 &1256056353
PrefabInstance:
m_ObjectHideFlags: 0
@@ -7071,6 +7071,11 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2976268035275492179, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2,
type: 3}
propertyPath: isstarRay
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4834088618036615507, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2,
type: 3}
propertyPath: m_Name
@@ -7126,6 +7131,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7991966796457908978, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []

1325
Assets/Scenes/Scene_01.unity
View File

File diff suppressed because it is too large Load Diff

5
Assets/Scenes/Scene_02.unity
View File

@@ -3024,6 +3024,11 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 1723237086}
m_Modifications:
- target: {fileID: 3095479328550319456, guid: fa8bc7855fba34c4ca59249df3c9b32e,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4176108320266076647, guid: fa8bc7855fba34c4ca59249df3c9b32e,
type: 3}
propertyPath: m_Name

12
Assets/Scenes/Scene_03.unity
View File

@@ -413,6 +413,13 @@ PrefabInstance:
- {fileID: 3948502910014026605, guid: 18ddc2054aee5b54e9c09c0e05378625, type: 3}
- {fileID: 4417452005158563314, guid: 18ddc2054aee5b54e9c09c0e05378625, type: 3}
- {fileID: 4089517035679547696, guid: 18ddc2054aee5b54e9c09c0e05378625, type: 3}
- {fileID: 7542295077734209628, guid: 18ddc2054aee5b54e9c09c0e05378625, type: 3}
- {fileID: 8209311133484194709, guid: 18ddc2054aee5b54e9c09c0e05378625, type: 3}
- {fileID: 5678536911015063985, guid: 18ddc2054aee5b54e9c09c0e05378625, type: 3}
- {fileID: 7614414963295279107, guid: 18ddc2054aee5b54e9c09c0e05378625, type: 3}
- {fileID: 1628264774198475183, guid: 18ddc2054aee5b54e9c09c0e05378625, type: 3}
- {fileID: 4733569524448313035, guid: 18ddc2054aee5b54e9c09c0e05378625, type: 3}
- {fileID: 6465630586480416992, guid: 18ddc2054aee5b54e9c09c0e05378625, type: 3}
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 18ddc2054aee5b54e9c09c0e05378625, type: 3}
@@ -5591,6 +5598,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5788733004288921753, guid: 6d47fedfa1abfbb48adb49c03ab871b0,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6167372864087005594, guid: 6d47fedfa1abfbb48adb49c03ab871b0,
type: 3}
propertyPath: m_Name

45
Assets/Scenes/Scene_04.unity
View File

@@ -132,11 +132,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 148837295}
m_Modifications:
- target: {fileID: 1998397215031579291, guid: 24a91d9a67655f144b82e0add7998d26,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2103619870731976709, guid: 24a91d9a67655f144b82e0add7998d26,
type: 3}
propertyPath: m_ProbeAnchor
@@ -192,55 +187,23 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4961042538970072742, guid: 24a91d9a67655f144b82e0add7998d26,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5112269294770908181, guid: 24a91d9a67655f144b82e0add7998d26,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5747214725435286076, guid: 24a91d9a67655f144b82e0add7998d26,
type: 3}
propertyPath: m_ProbeAnchor
value:
objectReference: {fileID: 1207905035}
- target: {fileID: 7795943426086755072, guid: 24a91d9a67655f144b82e0add7998d26,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7814246750790102882, guid: 24a91d9a67655f144b82e0add7998d26,
type: 3}
propertyPath: m_ProbeAnchor
value:
objectReference: {fileID: 1207905036}
- target: {fileID: 7969171055797188519, guid: 24a91d9a67655f144b82e0add7998d26,
type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8674344223236799108, guid: 24a91d9a67655f144b82e0add7998d26,
type: 3}
propertyPath: m_Name
value: Dynamic
objectReference: {fileID: 0}
- target: {fileID: 9102133241805780065, guid: 24a91d9a67655f144b82e0add7998d26,
type: 3}
propertyPath: m_ProbeAnchor
value:
objectReference: {fileID: 335298693}
- target: {fileID: 9102133241805780065, guid: 24a91d9a67655f144b82e0add7998d26,
type: 3}
propertyPath: m_LightProbeUsage
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects:
- {fileID: 5112269294770908181, guid: 24a91d9a67655f144b82e0add7998d26, type: 3}
- {fileID: 7795943426086755072, guid: 24a91d9a67655f144b82e0add7998d26, type: 3}
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 24a91d9a67655f144b82e0add7998d26, type: 3}
@@ -1185,12 +1148,6 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 1207905033}
m_PrefabAsset: {fileID: 0}
--- !u!4 &335298693 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8415351927954261522, guid: 24a91d9a67655f144b82e0add7998d26,
type: 3}
m_PrefabInstance: {fileID: 1098178}
m_PrefabAsset: {fileID: 0}
--- !u!1 &335635360 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2763557683422445007, guid: 23951a5da0e0b65468ea6459acff8251,

11924
Assets/Scenes/Scene_05.unity
View File

File diff suppressed because it is too large Load Diff

3046
Assets/Scenes/Scene_06.unity
View File

File diff suppressed because it is too large Load Diff

54
Assets/Scripts/Hand/NengNiangQiuCtr.cs
View File

@@ -17,44 +17,52 @@ public class NengNiangQiuCtr : MonoBehaviour
GlobalEventMgr.Listen<bool, int, int>(GameEvent.EventRayQuadOk, GameDataManage_EventRayQuadOk);
GlobalEventMgr.Listen<int>(GameEvent.EventHandRelease, GameDataManage_EventHandRelease);
GlobalEventMgr.Listen(GameEvent.EventHideCatchFont, GameDataManage_EventHideCatchFont);
}
// Update is called once per frame
void GameDataManage_EventRayQuadOk(bool isCatchOk, int handType, int fontIndex)
{
_handType = handType;
_fontIndex = fontIndex;
if (_handType == 1)
if (!SceneMgr.Instance.isTrigger)
{
nengniangquObj_L.SetActive(true);
}
else
{
nengniangquObj_R.SetActive(true);
_handType = handType;
_fontIndex = fontIndex;
if (_handType == 1)
{
nengniangquObj_L.SetActive(true);
}
else
{
nengniangquObj_R.SetActive(true);
}
}
}
void GameDataManage_EventHandRelease(int handType)
{
if (handType == 1)
if (!SceneMgr.Instance.isTrigger)
{
if (nengniangquObj_L.activeSelf)
if (handType == 1)
{
nengniangquObj_L.SetActive(false);
//<2F><><EFBFBD>ֵ<EFBFBD>λ<EFBFBD><CEBB><EFBFBD><EFBFBD>ʾ<EFBFBD><CABE>
GlobalEventMgr.Dispatch(GameEvent.EventShowCatchFont, true, _handType, _fontIndex);//1<><31><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
}
}
else
{
if (nengniangquObj_R.activeSelf)
{
nengniangquObj_R.SetActive(false);
//<2F><><EFBFBD>ֵ<EFBFBD>λ<EFBFBD><CEBB><EFBFBD><EFBFBD>ʾ<EFBFBD><CABE>
GlobalEventMgr.Dispatch(GameEvent.EventShowCatchFont, true, _handType, _fontIndex);//2:<3A><><EFBFBD><EFBFBD>
if (nengniangquObj_L.activeSelf)
{
nengniangquObj_L.SetActive(false);
//<2F><><EFBFBD>ֵ<EFBFBD>λ<EFBFBD><CEBB><EFBFBD><EFBFBD>ʾ<EFBFBD><CABE>
GlobalEventMgr.Dispatch(GameEvent.EventShowCatchFont, true, _handType, _fontIndex);//1<><31><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
}
}
else
{
if (nengniangquObj_R.activeSelf)
{
nengniangquObj_R.SetActive(false);
//<2F><><EFBFBD>ֵ<EFBFBD>λ<EFBFBD><CEBB><EFBFBD><EFBFBD>ʾ<EFBFBD><CABE>
GlobalEventMgr.Dispatch(GameEvent.EventShowCatchFont, true, _handType, _fontIndex);//2:<3A><><EFBFBD><EFBFBD>
}
}
}
}
void GameDataManage_EventHideCatchFont()

31
Assets/Scripts/HandCatch/GrabItem.cs
View File

@@ -1,3 +1,5 @@
using BigSpace.Logic;
using BigSpace.XRCore.Event;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
@@ -25,14 +27,14 @@ public class GrabItem : MonoBehaviour
float runTime = 0;
//<2F><>ʱ<EFBFBD>ȴ<EFBFBD><C8B4><EFBFBD>ʾ<EFBFBD><CABE><EFBFBD>ֵĶ<D6B5><C4B6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ч<EFBFBD><D0A7>
bool isRun2 = false;
bool isRun2 = false;
float waitTime2 = 1f;
float runTime2 = 0;
private void Awake()
{
m_rig = GetComponent<Rigidbody>();
if(effectHideAndShowCtr == null)
if (effectHideAndShowCtr == null)
effectHideAndShowCtr = GetComponent<EffectHideAndShowCtr>();
m_originParent = transform.parent;
startPosition = this.transform.localPosition;
@@ -43,7 +45,7 @@ public class GrabItem : MonoBehaviour
{
if (isRun)
{
runTime += Time.deltaTime;
if (runTime >= waitTime)
{
@@ -108,11 +110,14 @@ public class GrabItem : MonoBehaviour
{
if (other.gameObject.CompareTag("RightHand"))
{
SceneMgr.Instance.isTrigger = true;
//Debug.Log("Ent<6E><74><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:"+other.gameObject.name);
//if (m_catch == null)
m_catch = other.GetComponent<CatchManager>();
m_catch = other.GetComponent<CatchManager>();
SetTriggerParameter("DisTrigger");
// GlobalEventMgr.Dispatch(GameEvent.EventRayEnd2);
if (m_catch == null) return;
// Debug.Log("111<31>Ƿ<EFBFBD><C7B7><EFBFBD>ʼ:"+ m_catch.Start);
// Debug.Log("111<31>Ƿ<EFBFBD><C7B7><EFBFBD>ʼ:"+ m_catch.Start);
if (m_catch.Start)
{
isRun = false;
@@ -127,6 +132,15 @@ public class GrabItem : MonoBehaviour
}
}
}
private void OnTriggerExit(Collider other)
{
if (other.gameObject.CompareTag("RightHand"))
{
SceneMgr.Instance.isTrigger = false;
//GlobalEventMgr.Dispatch(GameEvent.EventRayEnd);
}
}
private void OnTriggerStay(Collider other)
{
@@ -134,8 +148,7 @@ public class GrabItem : MonoBehaviour
{
//Debug.Log("Stay<61><79><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"+ other.gameObject.name);
//if (m_catch == null)
m_catch = other.GetComponent<CatchManager>();
SetTriggerParameter("DisTrigger");
m_catch = other.GetComponent<CatchManager>();
if (m_catch == null) return;
//Debug.Log("222<32>Ƿ<EFBFBD><C7B7><EFBFBD>ʼ:" + m_catch.Start);
if (m_catch.Start)
@@ -162,7 +175,7 @@ public class GrabItem : MonoBehaviour
private void SetStartPosition()
{
this.transform.localRotation = new Quaternion(0,0,0,0);
this.transform.localRotation = new Quaternion(0, 0, 0, 0);
this.transform.localPosition = startPosition;
}
@@ -170,7 +183,7 @@ public class GrabItem : MonoBehaviour
{
if (this.GetComponent<UpDownMovement>() != null)
{
Debug.Log("<22><><EFBFBD><EFBFBD><EFBFBD>ƶ<EFBFBD>:"+isMove);
Debug.Log("<22><><EFBFBD><EFBFBD><EFBFBD>ƶ<EFBFBD>:" + isMove);
this.GetComponent<UpDownMovement>().isMove = isMove;
}
}

2
Assets/Scripts/Logic/GameEvent.cs
View File

@@ -31,6 +31,8 @@ namespace BigSpace.Logic
EventAnimalSend = 19, //创建动物发送
EventAnimalSync = 20, //创建动物同步
EventRayStart = 21, //调用射线
EventRayEnd=33,
EventRayEnd2 = 34,
EventSetPAFreame = 22, //出界时设置显示区域框
EventHideLevelPlay = 23, //隐藏出界地图
EventSetHandMove = 24, //设置手柄是否可移动

53
Assets/Scripts/Scene_02/RayCtr.cs
View File

@@ -10,7 +10,7 @@ public class RayCtr : MonoBehaviour
public bool starRay = false; //<2F>Ƿ<EFBFBD><C7B7><EFBFBD>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD>
public LayerMask detectionLayer ; //<2F><><EFBFBD><EFBFBD><EFBFBD>IJ㼶
public int myhandType; //<2F>Լ<EFBFBD><D4BC>ֵ<EFBFBD><D6B5><EFBFBD><EFBFBD><EFBFBD>1<EFBFBD><31><EFBFBD><EFBFBD> 2<><32><EFBFBD><EFBFBD>
public bool isstarRay = false;
//<2F><>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD>
@@ -29,7 +29,8 @@ public class RayCtr : MonoBehaviour
void Start()
{
GlobalEventMgr.Listen<int>(GameEvent.EventRayStart, GameDataManage_EventRayStart);
GlobalEventMgr.Listen<int>(GameEvent.EventRayEnd, GameDataManage_EventRayEnd);
GlobalEventMgr.Listen<int>(GameEvent.EventRayEnd, GameDataManage_EventRayEnd2);
//// <20><><EFBFBD><EFBFBD>LineRenderer<65><72><EFBFBD><EFBFBD>
//lineRenderer = gameObject.AddComponent<LineRenderer>();
@@ -68,32 +69,36 @@ public class RayCtr : MonoBehaviour
void Update()
{
//UpdateVisualRay(); //<2F><>ʾ<EFBFBD><CABE><EFBFBD><EFBFBD>
if (!isstarRay) { return; }
// <20>ڳ<EFBFBD><DAB3><EFBFBD><EFBFBD><EFBFBD>ͼ<EFBFBD>л<EFBFBD><D0BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ߣ<EFBFBD><DFA3><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڵ<EFBFBD><DAB5>ԣ<EFBFBD>
if (starRay)
if (!SceneMgr.Instance.isTrigger)
{
Debug.DrawRay(transform.position, transform.forward * rayLength, Color.red);
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>λ<EFBFBD><CEBB><EFBFBD><EFBFBD>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
Ray ray = new Ray(transform.position, transform.forward);
RaycastHit hit; // <20>洢<EFBFBD><E6B4A2><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ײ<EFBFBD><D7B2>Ϣ
//Debug.Log("<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>......<2E><>1<EFBFBD><31>");
if (Physics.Raycast(ray, out hit, rayLength, detectionLayer))
if (starRay)
{
GameObject hitObject = hit.collider.gameObject; // <20><>ȡ<EFBFBD><C8A1>ײ<EFBFBD><D7B2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
Debug.DrawRay(transform.position, transform.forward * rayLength, Color.red);
//Debug.Log("<EFBFBD><EFBFBD><EFBFBD>⵽<EFBFBD><EFBFBD><EFBFBD><EFBFBD>: " + hitObject.name+"||"+ hitObject.name.Substring(0, 4)); // <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
if ("Quad" == hitObject.name.Substring(0, 4))
// <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>λ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǰ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
Ray ray = new Ray(transform.position, transform.forward);
RaycastHit hit; // <20>洢<EFBFBD><E6B4A2><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ײ<EFBFBD><D7B2>Ϣ
//Debug.Log("<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>......<2E><>1<EFBFBD><31>");
if (Physics.Raycast(ray, out hit, rayLength, detectionLayer))
{
fontIndex = int.Parse(hitObject.name.Substring(4));
Debug.Log("<22><><EFBFBD>˵ڼ<CBB5><DABC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>......"+ fontIndex);
starRay = false;
isRun = false;
runTime = 0;
GlobalEventMgr.Dispatch(GameEvent.EventRayQuadOk, true, myhandType, fontIndex);
GameObject hitObject = hit.collider.gameObject; // <20><>ȡ<EFBFBD><C8A1>ײ<EFBFBD><D7B2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
//Debug.Log("<22><><EFBFBD>⵽<EFBFBD><E2B5BD><EFBFBD><EFBFBD>: " + hitObject.name+"||"+ hitObject.name.Substring(0, 4)); // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
if ("Quad" == hitObject.name.Substring(0, 4))
{
fontIndex = int.Parse(hitObject.name.Substring(4));
Debug.Log("<22><><EFBFBD>˵ڼ<CBB5><DABC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>......" + fontIndex);
starRay = false;
isRun = false;
runTime = 0;
GlobalEventMgr.Dispatch(GameEvent.EventRayQuadOk, true, myhandType, fontIndex);
}
}
}
}
if (isRun)
{
@@ -117,4 +122,12 @@ public class RayCtr : MonoBehaviour
runTime = 0;
}
}
void GameDataManage_EventRayEnd(int type)
{
isstarRay = true;
}
void GameDataManage_EventRayEnd2(int type)
{
isstarRay = false;
}
}

2
Assets/Scripts/Scene_05/TouchPlayAnimatior.cs
View File

@@ -12,7 +12,7 @@ public class TouchPlayAnimatior : MonoBehaviour
public AudioClip[] audioClips;
//<2F><>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD>
bool isRun = false;
float waitTime = 2f;
float waitTime = 4f;
float runTime = 0;
float showGrabItem = 1.5f; //<2F><>ʾ<EFBFBD><CABE><EFBFBD><EFBFBD>ͭ<EFBFBD>ߵ<EFBFBD>ʱ<EFBFBD><CAB1>

1
Assets/Scripts/XRCore/Scene/SceneMgr.cs
View File

@@ -14,6 +14,7 @@ public class SceneMgr : MonoSingleton<SceneMgr>
private string _sceneName;
public int nowSceneId = 0; //<2F><>ǰ<EFBFBD><C7B0>ʽ<EFBFBD>ij<EFBFBD><C4B3><EFBFBD>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>м<EFBFBD><D0BC><EFBFBD><EFBFBD>ȳ<EFBFBD><C8B3><EFBFBD>)
public bool isCanMove = true;//<2F>Ƿ<EFBFBD><C7B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֱ<EFBFBD><D6B1>߶<EFBFBD>
public bool isTrigger = false;
/// <summary>
/// <20><>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
/// </summary>

14
Assets/Settings/URP-HighFidelity.asset
View File

@@ -23,7 +23,7 @@ MonoBehaviour:
m_RequireOpaqueTexture: 0
m_OpaqueDownsampling: 0
m_SupportsTerrainHoles: 0
m_SupportsHDR: 1
m_SupportsHDR: 0
m_HDRColorBufferPrecision: 1
m_MSAA: 4
m_RenderScale: 1
@@ -34,11 +34,11 @@ MonoBehaviour:
m_LODCrossFadeDitheringType: 1
m_ShEvalMode: 0
m_MainLightRenderingMode: 1
m_MainLightShadowsSupported: 1
m_MainLightShadowsSupported: 0
m_MainLightShadowmapResolution: 2048
m_AdditionalLightsRenderingMode: 1
m_AdditionalLightsPerObjectLimit: 2
m_AdditionalLightShadowsSupported: 1
m_AdditionalLightShadowsSupported: 0
m_AdditionalLightsShadowmapResolution: 2048
m_AdditionalLightsShadowResolutionTierLow: 256
m_AdditionalLightsShadowResolutionTierMedium: 512
@@ -82,9 +82,9 @@ MonoBehaviour:
m_Textures:
blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3}
bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3}
m_PrefilteringModeMainLightShadows: 3
m_PrefilteringModeMainLightShadows: 0
m_PrefilteringModeAdditionalLight: 4
m_PrefilteringModeAdditionalLightShadows: 2
m_PrefilteringModeAdditionalLightShadows: 0
m_PrefilterXRKeywords: 0
m_PrefilteringModeForwardPlus: 0
m_PrefilteringModeDeferredRendering: 0
@@ -106,8 +106,8 @@ MonoBehaviour:
m_PrefilterDBufferMRT3: 1
m_PrefilterSoftShadowsQualityLow: 1
m_PrefilterSoftShadowsQualityMedium: 1
m_PrefilterSoftShadowsQualityHigh: 0
m_PrefilterSoftShadows: 1
m_PrefilterSoftShadowsQualityHigh: 1
m_PrefilterSoftShadows: 0
m_PrefilterScreenCoord: 1
m_PrefilterNativeRenderPass: 1
m_ShaderVariantLogLevel: 0

BIN
Assets/timeline_S4_zichan/v014/C_hh_z/gou.fbx
View File

Binary file not shown.