1
This commit is contained in:
@@ -45,7 +45,7 @@ public class MipmapLevelController : MonoBehaviour
|
|||||||
allRenderers.Add(renderer);
|
allRenderers.Add(renderer);
|
||||||
}
|
}
|
||||||
|
|
||||||
Debug.Log($"收集到 {allRenderers.Count} 个渲染器");
|
//Debug.Log($"收集到 {allRenderers.Count} 个渲染器");
|
||||||
}
|
}
|
||||||
|
|
||||||
void ApplyMipMapBias()
|
void ApplyMipMapBias()
|
||||||
@@ -74,7 +74,7 @@ public class MipmapLevelController : MonoBehaviour
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Debug.Log($"已应用MipMap偏移:{mipMapBias}");
|
//Debug.Log($"已应用MipMap偏移:{mipMapBias}");
|
||||||
}
|
}
|
||||||
|
|
||||||
void ResetMipMapBias()
|
void ResetMipMapBias()
|
||||||
@@ -103,7 +103,7 @@ public class MipmapLevelController : MonoBehaviour
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Debug.Log("已重置所有MipMap偏移");
|
//Debug.Log("已重置所有MipMap偏移");
|
||||||
}
|
}
|
||||||
|
|
||||||
[ContextMenu("刷新渲染器列表")]
|
[ContextMenu("刷新渲染器列表")]
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ GameObject:
|
|||||||
- component: {fileID: 3788934187443606980}
|
- component: {fileID: 3788934187443606980}
|
||||||
- component: {fileID: 6689011352467496096}
|
- component: {fileID: 6689011352467496096}
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: 'SM_B5_S5_06_S '
|
m_Name: SM_B5_S5_06_S
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -2494,6 +2494,11 @@ PrefabInstance:
|
|||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: LeavePlayPrefabControll
|
value: LeavePlayPrefabControll
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7069304620107124278, guid: ce9599ce44e0e24458ea019ad346716d,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_IsActive
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 7458036652081108676, guid: ce9599ce44e0e24458ea019ad346716d,
|
- target: {fileID: 7458036652081108676, guid: ce9599ce44e0e24458ea019ad346716d,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalPosition.x
|
propertyPath: m_LocalPosition.x
|
||||||
@@ -4479,7 +4484,7 @@ MonoBehaviour:
|
|||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
_isOffline: 1
|
_isOffline: 1
|
||||||
NextSceneId: 10001
|
NextSceneId: 10000
|
||||||
--- !u!4 &1249925296 stripped
|
--- !u!4 &1249925296 stripped
|
||||||
Transform:
|
Transform:
|
||||||
m_CorrespondingSourceObject: {fileID: 1433784918516034456, guid: ce9599ce44e0e24458ea019ad346716d,
|
m_CorrespondingSourceObject: {fileID: 1433784918516034456, guid: ce9599ce44e0e24458ea019ad346716d,
|
||||||
|
|||||||
@@ -182,6 +182,16 @@ PrefabInstance:
|
|||||||
propertyPath: m_LocalEulerAnglesHint.z
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 4380438713916278577, guid: 24a91d9a67655f144b82e0add7998d26,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_IsActive
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6560290179737207316, guid: 24a91d9a67655f144b82e0add7998d26,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_IsActive
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 8674344223236799108, guid: 24a91d9a67655f144b82e0add7998d26,
|
- target: {fileID: 8674344223236799108, guid: 24a91d9a67655f144b82e0add7998d26,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
|
|||||||
@@ -4152,6 +4152,30 @@ GameObject:
|
|||||||
type: 3}
|
type: 3}
|
||||||
m_PrefabInstance: {fileID: 1278419029}
|
m_PrefabInstance: {fileID: 1278419029}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!1 &459558487 stripped
|
||||||
|
GameObject:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 1621886325207062886, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 386026518160299567}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!1 &459558488 stripped
|
||||||
|
GameObject:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 1300387021435526210, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 386026518160299567}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!1 &459558489 stripped
|
||||||
|
GameObject:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 2440138569749437841, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 386026518160299567}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!1 &459558490 stripped
|
||||||
|
GameObject:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 4515659634069684542, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 386026518160299567}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!114 &486376473
|
--- !u!114 &486376473
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -8013,6 +8037,11 @@ PrefabInstance:
|
|||||||
propertyPath: Vfx
|
propertyPath: Vfx
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 429369814}
|
objectReference: {fileID: 429369814}
|
||||||
|
- target: {fileID: 955335111679568282, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: childAnimator
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 429369814}
|
||||||
- target: {fileID: 1997430245209971286, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
- target: {fileID: 1997430245209971286, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
@@ -8023,11 +8052,21 @@ PrefabInstance:
|
|||||||
propertyPath: m_Enabled
|
propertyPath: m_Enabled
|
||||||
value: 1
|
value: 1
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 2064027482910366093, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: childAnimator
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 459558490}
|
||||||
- target: {fileID: 2259433569369500350, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
- target: {fileID: 2259433569369500350, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: Vfx
|
propertyPath: Vfx
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 1734470758}
|
objectReference: {fileID: 1734470758}
|
||||||
|
- target: {fileID: 2259433569369500350, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: childAnimator
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 1734470758}
|
||||||
- target: {fileID: 2494245550838029784, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
- target: {fileID: 2494245550838029784, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_ProbeAnchor
|
propertyPath: m_ProbeAnchor
|
||||||
@@ -8038,6 +8077,11 @@ PrefabInstance:
|
|||||||
propertyPath: Vfx
|
propertyPath: Vfx
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 429369812}
|
objectReference: {fileID: 429369812}
|
||||||
|
- target: {fileID: 2719340678950428381, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: childAnimator
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 429369812}
|
||||||
- target: {fileID: 2722298287686595198, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
- target: {fileID: 2722298287686595198, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_IsActive
|
propertyPath: m_IsActive
|
||||||
@@ -8053,6 +8097,11 @@ PrefabInstance:
|
|||||||
propertyPath: Vfx
|
propertyPath: Vfx
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 1375147206}
|
objectReference: {fileID: 1375147206}
|
||||||
|
- target: {fileID: 3015957191330752537, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: childAnimator
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 1375147206}
|
||||||
- target: {fileID: 3408544192035783520, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
- target: {fileID: 3408544192035783520, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_IsActive
|
propertyPath: m_IsActive
|
||||||
@@ -8078,6 +8127,11 @@ PrefabInstance:
|
|||||||
propertyPath: m_ProbeAnchor
|
propertyPath: m_ProbeAnchor
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 155376564}
|
objectReference: {fileID: 155376564}
|
||||||
|
- target: {fileID: 4598257995424818510, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: childAnimator
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 459558488}
|
||||||
- target: {fileID: 4843356370924522973, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
- target: {fileID: 4843356370924522973, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_ProbeAnchor
|
propertyPath: m_ProbeAnchor
|
||||||
@@ -8093,6 +8147,11 @@ PrefabInstance:
|
|||||||
propertyPath: Vfx
|
propertyPath: Vfx
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 429369815}
|
objectReference: {fileID: 429369815}
|
||||||
|
- target: {fileID: 5173771650499249720, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: childAnimator
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 429369815}
|
||||||
- target: {fileID: 5870637899761959503, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
- target: {fileID: 5870637899761959503, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalPosition.x
|
propertyPath: m_LocalPosition.x
|
||||||
@@ -8149,6 +8208,11 @@ PrefabInstance:
|
|||||||
value:
|
value:
|
||||||
objectReference: {fileID: 6842589034014390235, guid: fd76f8354f56129449a98520bdbbfa9f,
|
objectReference: {fileID: 6842589034014390235, guid: fd76f8354f56129449a98520bdbbfa9f,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
- target: {fileID: 7773408257953736811, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: childAnimator
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 459558487}
|
||||||
- target: {fileID: 7961303027377299180, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
- target: {fileID: 7961303027377299180, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_IsActive
|
propertyPath: m_IsActive
|
||||||
@@ -8159,6 +8223,11 @@ PrefabInstance:
|
|||||||
propertyPath: Vfx
|
propertyPath: Vfx
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 429369813}
|
objectReference: {fileID: 429369813}
|
||||||
|
- target: {fileID: 8128716103914848196, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: childAnimator
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 429369813}
|
||||||
- target: {fileID: 8304914913776413196, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
- target: {fileID: 8304914913776413196, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_ProbeAnchor
|
propertyPath: m_ProbeAnchor
|
||||||
@@ -8179,6 +8248,11 @@ PrefabInstance:
|
|||||||
propertyPath: Vfx1
|
propertyPath: Vfx1
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 1636499099}
|
objectReference: {fileID: 1636499099}
|
||||||
|
- target: {fileID: 9091343584757502294, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: childAnimator
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 459558489}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_RemovedGameObjects: []
|
m_RemovedGameObjects: []
|
||||||
m_AddedGameObjects: []
|
m_AddedGameObjects: []
|
||||||
|
|||||||
@@ -5392,7 +5392,7 @@ PrefabInstance:
|
|||||||
- target: {fileID: 5630877086306773795, guid: 4da8a903a6fadd74982c498aa9331530,
|
- target: {fileID: 5630877086306773795, guid: 4da8a903a6fadd74982c498aa9331530,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalPosition.x
|
propertyPath: m_LocalPosition.x
|
||||||
value: -9.313227e-10
|
value: -6.9849204e-10
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 5630877086306773795, guid: 4da8a903a6fadd74982c498aa9331530,
|
- target: {fileID: 5630877086306773795, guid: 4da8a903a6fadd74982c498aa9331530,
|
||||||
type: 3}
|
type: 3}
|
||||||
@@ -6218,6 +6218,51 @@ Animator:
|
|||||||
type: 3}
|
type: 3}
|
||||||
m_PrefabInstance: {fileID: 1331022472}
|
m_PrefabInstance: {fileID: 1331022472}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!1 &1675931463
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 1675931465}
|
||||||
|
- component: {fileID: 1675931464}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: (singleton)ChangSceneSphereMgr
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!114 &1675931464
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1675931463}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 9a63f1f7f8ce10d4c919a1dd2d723a9a, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
changSceneObj: {fileID: 0}
|
||||||
|
--- !u!4 &1675931465
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1675931463}
|
||||||
|
serializedVersion: 2
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 0}
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!1 &1685045244 stripped
|
--- !u!1 &1685045244 stripped
|
||||||
GameObject:
|
GameObject:
|
||||||
m_CorrespondingSourceObject: {fileID: 6810970351883720905, guid: 4da8a903a6fadd74982c498aa9331530,
|
m_CorrespondingSourceObject: {fileID: 6810970351883720905, guid: 4da8a903a6fadd74982c498aa9331530,
|
||||||
@@ -7142,3 +7187,4 @@ SceneRoots:
|
|||||||
m_Roots:
|
m_Roots:
|
||||||
- {fileID: 510055196}
|
- {fileID: 510055196}
|
||||||
- {fileID: 1771568951}
|
- {fileID: 1771568951}
|
||||||
|
- {fileID: 1675931465}
|
||||||
|
|||||||
@@ -4,9 +4,9 @@ using UnityEngine;
|
|||||||
|
|
||||||
public class GrabItem : MonoBehaviour
|
public class GrabItem : MonoBehaviour
|
||||||
{
|
{
|
||||||
public bool restIsBack = false; //<2F>ſ<EFBFBD><C5BF><EFBFBD><EFBFBD>Ƿ<C7B7>ԭλ<D4AD><CEBB>
|
public bool restIsBack = false; //<2F>ſ<EFBFBD><C5BF><EFBFBD><EFBFBD>Ƿ<C7B7>ԭλ<D4AD><CEBB>
|
||||||
public bool isUseRigidbody = false; //<2F>Ƿ<EFBFBD>ʹ<EFBFBD><CAB9><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
public bool isUseRigidbody = false; //<2F>Ƿ<EFBFBD>ʹ<EFBFBD><CAB9><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
private Vector3 startPosition = Vector3.zero; //<2F><>ʼλ<CABC><CEBB>
|
private Vector3 startPosition = Vector3.zero; //<2F><>ʼλ<CABC><CEBB>
|
||||||
public bool startIsUseRigid = true;
|
public bool startIsUseRigid = true;
|
||||||
private Rigidbody m_rig;
|
private Rigidbody m_rig;
|
||||||
public Transform m_originParent;
|
public Transform m_originParent;
|
||||||
@@ -19,12 +19,12 @@ public class GrabItem : MonoBehaviour
|
|||||||
|
|
||||||
public EffectHideAndShowCtr effectHideAndShowCtr;
|
public EffectHideAndShowCtr effectHideAndShowCtr;
|
||||||
|
|
||||||
//<2F><>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD>
|
//<2F><>ʱ<EFBFBD><CAB1><EFBFBD>
|
||||||
bool isRun = false;
|
bool isRun = false;
|
||||||
float waitTime = 2f;
|
float waitTime = 2f;
|
||||||
float runTime = 0;
|
float runTime = 0;
|
||||||
|
|
||||||
//<2F><>ʱ<EFBFBD>ȴ<EFBFBD><C8B4><EFBFBD>ʾ<EFBFBD><CABE><EFBFBD>ֵĶ<D6B5><C4B6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ч<EFBFBD><D0A7>
|
//<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 waitTime2 = 1f;
|
||||||
float runTime2 = 0;
|
float runTime2 = 0;
|
||||||
@@ -47,7 +47,7 @@ public class GrabItem : MonoBehaviour
|
|||||||
runTime += Time.deltaTime;
|
runTime += Time.deltaTime;
|
||||||
if (runTime >= waitTime)
|
if (runTime >= waitTime)
|
||||||
{
|
{
|
||||||
//<2F><>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD>
|
//<2F><>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD>
|
||||||
isRun = false;
|
isRun = false;
|
||||||
runTime = 0;
|
runTime = 0;
|
||||||
HideObj();
|
HideObj();
|
||||||
@@ -108,12 +108,13 @@ public class GrabItem : MonoBehaviour
|
|||||||
{
|
{
|
||||||
if (other.gameObject.CompareTag("RightHand"))
|
if (other.gameObject.CompareTag("RightHand"))
|
||||||
{
|
{
|
||||||
//Debug.Log("Ent<6E><74><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:"+other.gameObject.name);
|
//Debug.Log("Ent<6E><74><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:"+other.gameObject.name);
|
||||||
|
SetTriggerParameter("DisTrigger");
|
||||||
|
SceneMgr.Instance.isTrigger=true;
|
||||||
//if (m_catch == null)
|
//if (m_catch == null)
|
||||||
m_catch = other.GetComponent<CatchManager>();
|
m_catch = other.GetComponent<CatchManager>();
|
||||||
SetTriggerParameter("DisTrigger");
|
|
||||||
if (m_catch == null) return;
|
if (m_catch == null) return;
|
||||||
// Debug.Log("111<31>Ƿ<EFBFBD><EFBFBD><EFBFBD>ʼ:"+ m_catch.Start);
|
// Debug.Log("111<31>Ƿ<EFBFBD>ʼ:"+ m_catch.Start);
|
||||||
if (m_catch.Start)
|
if (m_catch.Start)
|
||||||
{
|
{
|
||||||
isRun = false;
|
isRun = false;
|
||||||
@@ -128,17 +129,24 @@ public class GrabItem : MonoBehaviour
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
private void OnTriggerExit(Collider other)
|
||||||
|
{
|
||||||
|
if (other.gameObject.CompareTag("RightHand"))
|
||||||
|
{
|
||||||
|
|
||||||
|
SceneMgr.Instance.isTrigger = false;
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
private void OnTriggerStay(Collider other)
|
private void OnTriggerStay(Collider other)
|
||||||
{
|
{
|
||||||
if (other.gameObject.CompareTag("RightHand"))
|
if (other.gameObject.CompareTag("RightHand"))
|
||||||
{
|
{
|
||||||
//Debug.Log("Stay<61><79><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"+ other.gameObject.name);
|
//Debug.Log("Stay<61><79><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"+ other.gameObject.name);
|
||||||
//if (m_catch == null)
|
|
||||||
m_catch = other.GetComponent<CatchManager>();
|
m_catch = other.GetComponent<CatchManager>();
|
||||||
|
|
||||||
if (m_catch == null) return;
|
if (m_catch == null) return;
|
||||||
//Debug.Log("222<32>Ƿ<EFBFBD><EFBFBD><EFBFBD>ʼ:" + m_catch.Start);
|
//Debug.Log("222<32>Ƿ<EFBFBD>ʼ:" + m_catch.Start);
|
||||||
if (m_catch.Start)
|
if (m_catch.Start)
|
||||||
{
|
{
|
||||||
isRun = false;
|
isRun = false;
|
||||||
@@ -171,18 +179,19 @@ public class GrabItem : MonoBehaviour
|
|||||||
{
|
{
|
||||||
if (this.GetComponent<UpDownMovement>() != null)
|
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;
|
this.GetComponent<UpDownMovement>().isMove = isMove;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
[Header("<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>")]
|
[Header("<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>")]
|
||||||
[SerializeField] private GameObject childAnimator; // ֱ<><D6B1><EFBFBD>϶<EFBFBD><CFB6><EFBFBD><EFBFBD><EFBFBD>
|
[SerializeField] private GameObject childAnimator; // ֱ<><D6B1><EFBFBD>϶<EFBFBD><CFB6><EFBFBD>
|
||||||
|
|
||||||
public void SetTriggerParameter(string parameterName)
|
public void SetTriggerParameter(string parameterName)
|
||||||
{
|
{
|
||||||
if (childAnimator != null)
|
if (childAnimator != null)
|
||||||
{
|
{
|
||||||
Destroy(childAnimator);
|
Destroy(childAnimator);
|
||||||
|
childAnimator = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -100,11 +100,11 @@ public class LeavePlayAreaControll : MonoBehaviour
|
|||||||
|
|
||||||
private void GameDataManage_EventCheckBoxCollider(int index)
|
private void GameDataManage_EventCheckBoxCollider(int index)
|
||||||
{
|
{
|
||||||
Debug.Log("自动检测位置:" + index);
|
//Debug.Log("自动检测位置:" + index);
|
||||||
//if (this.gameObject.active && index == myId)
|
//if (this.gameObject.active && index == myId)
|
||||||
if (index == myId)
|
if (index == myId)
|
||||||
{
|
{
|
||||||
Debug.Log("进来了.....");
|
//Debug.Log("进来了.....");
|
||||||
isCheck = true;
|
isCheck = true;
|
||||||
StartCoroutine(CheckIsEnter(index));
|
StartCoroutine(CheckIsEnter(index));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ public class PlayJiaGuAnimator : MonoBehaviour
|
|||||||
public AudioSource audio_HuiDa;
|
public AudioSource audio_HuiDa;
|
||||||
public GameObject audio_Wen;
|
public GameObject audio_Wen;
|
||||||
|
|
||||||
//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾʱ<CABE><CAB1>
|
//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾʱ<CABE><CAB1>
|
||||||
bool oneIsRun = false;
|
bool oneIsRun = false;
|
||||||
float oneWaitTime = 26f;
|
float oneWaitTime = 26f;
|
||||||
float oneRunTime = 0;
|
float oneRunTime = 0;
|
||||||
@@ -40,7 +40,7 @@ public class PlayJiaGuAnimator : MonoBehaviour
|
|||||||
{
|
{
|
||||||
oneIsRun = false;
|
oneIsRun = false;
|
||||||
oneRunTime = 0;
|
oneRunTime = 0;
|
||||||
if (font != null) //<2F><>ʾ<EFBFBD><CABE>
|
if (font != null) //<2F><>ʾ<EFBFBD><CABE>
|
||||||
font.PlayShowJGWFont();
|
font.PlayShowJGWFont();
|
||||||
if (animatorJiaGu != null)
|
if (animatorJiaGu != null)
|
||||||
animatorJiaGu.SetActive(false);
|
animatorJiaGu.SetActive(false);
|
||||||
@@ -49,14 +49,15 @@ public class PlayJiaGuAnimator : MonoBehaviour
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
[Header("<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>")]
|
[Header("<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>")]
|
||||||
[SerializeField] private List<GameObject> childAnimator; // ֱ<><D6B1><EFBFBD>϶<EFBFBD><CFB6><EFBFBD><EFBFBD><EFBFBD>
|
[SerializeField] private List<GameObject> childAnimator; // ֱ<><D6B1><EFBFBD>϶<EFBFBD><CFB6><EFBFBD>
|
||||||
|
|
||||||
public void SetTriggerParameter(string parameterName)
|
public void SetTriggerParameter(string parameterName)
|
||||||
{
|
{
|
||||||
for (int i = 0; i < childAnimator.Count; i++)
|
for (int i = 0; i < childAnimator.Count; i++)
|
||||||
{
|
{
|
||||||
Destroy(childAnimator[i]);
|
Destroy(childAnimator[i]);
|
||||||
|
childAnimator[i] = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
private void OnTriggerEnter(Collider other)
|
private void OnTriggerEnter(Collider other)
|
||||||
@@ -66,6 +67,7 @@ public class PlayJiaGuAnimator : MonoBehaviour
|
|||||||
if (listAnimator != null)
|
if (listAnimator != null)
|
||||||
{
|
{
|
||||||
SetTriggerParameter("DisTrigger");
|
SetTriggerParameter("DisTrigger");
|
||||||
|
SceneMgr.Instance.isTrigger=true;
|
||||||
for (int i = 0; i < listAnimator.Count; i++)
|
for (int i = 0; i < listAnimator.Count; i++)
|
||||||
{
|
{
|
||||||
if (HandType == 1)
|
if (HandType == 1)
|
||||||
@@ -80,7 +82,7 @@ public class PlayJiaGuAnimator : MonoBehaviour
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
oneIsRun = true;
|
oneIsRun = true;
|
||||||
GlobalEventMgr.Dispatch(GameEvent.EventHideTuchJiaGu); //ֻ<><D6BB><EFBFBD><EFBFBD>һ<EFBFBD>Σ<EFBFBD><CEA3>ر<EFBFBD><D8B1><EFBFBD><EFBFBD>еĿɴ<C4BF><C9B4><EFBFBD><EFBFBD><EFBFBD><D7B9><EFBFBD>ײ
|
GlobalEventMgr.Dispatch(GameEvent.EventHideTuchJiaGu); //ֻ<><D6BB><EFBFBD><EFBFBD>һ<EFBFBD>Σ<EFBFBD><CEA3>ر<EFBFBD><D8B1><EFBFBD><EFBFBD>еĿɴ<C4BF><C9B4><EFBFBD><EFBFBD><EFBFBD><D7B9><EFBFBD>ײ
|
||||||
if (audio_HuiDa != null)
|
if (audio_HuiDa != null)
|
||||||
{
|
{
|
||||||
audio_HuiDa.Play();
|
audio_HuiDa.Play();
|
||||||
|
|||||||
@@ -8,14 +8,14 @@ public class TouchPlayAnimatior : MonoBehaviour
|
|||||||
public GrabItem grabItem;
|
public GrabItem grabItem;
|
||||||
Animator animator;
|
Animator animator;
|
||||||
AudioSource audioSource;
|
AudioSource audioSource;
|
||||||
//clips<70><73><EFBFBD><EFBFBD>
|
//clips<70><73><EFBFBD><EFBFBD>
|
||||||
public AudioClip[] audioClips;
|
public AudioClip[] audioClips;
|
||||||
//<2F><>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD>
|
//<2F><>ʱ<EFBFBD><CAB1><EFBFBD>
|
||||||
bool isRun = false;
|
bool isRun = false;
|
||||||
float waitTime = 4f;
|
float waitTime = 4f;
|
||||||
float runTime = 0;
|
float runTime = 0;
|
||||||
|
|
||||||
float showGrabItem = 1.5f; //<2F><>ʾ<EFBFBD><CABE><EFBFBD><EFBFBD>ͭ<EFBFBD>ߵ<EFBFBD>ʱ<EFBFBD><CAB1>
|
float showGrabItem = 1.5f; //<2F><>ʾ<EFBFBD><CABE><EFBFBD><EFBFBD>ͭ<EFBFBD>ߵ<EFBFBD>ʱ<EFBFBD><CAB1>
|
||||||
|
|
||||||
// Start is called before the first frame update
|
// Start is called before the first frame update
|
||||||
void Start()
|
void Start()
|
||||||
@@ -40,7 +40,7 @@ public class TouchPlayAnimatior : MonoBehaviour
|
|||||||
// grabItem.gameObject.SetActive(true);
|
// grabItem.gameObject.SetActive(true);
|
||||||
this.gameObject.SetActive(false);
|
this.gameObject.SetActive(false);
|
||||||
}
|
}
|
||||||
if (runTime >= showGrabItem) //<2F><>ʾ<EFBFBD><CABE><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͭ<EFBFBD><EFBFBD>
|
if (runTime >= showGrabItem) //<2F><>ʾ<EFBFBD><CABE><EFBFBD><EFBFBD><EFBFBD>ͭ<EFBFBD><CDAD>
|
||||||
{
|
{
|
||||||
if (grabItem != null && grabItem.gameObject.activeSelf == false)
|
if (grabItem != null && grabItem.gameObject.activeSelf == false)
|
||||||
{
|
{
|
||||||
@@ -64,14 +64,24 @@ public class TouchPlayAnimatior : MonoBehaviour
|
|||||||
PlayAudioByIndex(0);
|
PlayAudioByIndex(0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
[Header("<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>")]
|
private void OnTriggerExit(Collider other)
|
||||||
[SerializeField] private Animator childAnimator; // ֱ<><D6B1><EFBFBD>϶<EFBFBD><CFB6><EFBFBD><EFBFBD><EFBFBD>
|
{
|
||||||
|
if (other.gameObject.name == "PalmBox_L" || other.gameObject.name == "PalmBox_R")
|
||||||
|
{
|
||||||
|
|
||||||
|
SceneMgr.Instance.isTrigger = false;
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
[Header("<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>")]
|
||||||
|
[SerializeField] private Object childAnimator; // ֱ<><D6B1><EFBFBD>϶<EFBFBD><CFB6><EFBFBD>
|
||||||
|
|
||||||
public void SetTriggerParameter(string parameterName)
|
public void SetTriggerParameter(string parameterName)
|
||||||
{
|
{
|
||||||
if (childAnimator != null)
|
if (childAnimator != null)
|
||||||
{
|
{
|
||||||
childAnimator.SetTrigger(parameterName);
|
Destroy(childAnimator);
|
||||||
|
childAnimator = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
void ShowFont()
|
void ShowFont()
|
||||||
@@ -91,7 +101,7 @@ public class TouchPlayAnimatior : MonoBehaviour
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Debug.LogWarning("<22><>Ƶ<EFBFBD><C6B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Χ<EFBFBD><CEA7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD><CEAA>");
|
Debug.LogWarning("<22><>Ƶ<EFBFBD><C6B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Χ<EFBFBD><CEA7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD><CEAA>");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -447,7 +447,7 @@ public class VR2 : MonoBehaviour
|
|||||||
|
|
||||||
var msgMemory = _receiveMemory.Slice(8, msgLength);
|
var msgMemory = _receiveMemory.Slice(8, msgLength);
|
||||||
string msg = Encoding.UTF8.GetString(msgMemory.Span);
|
string msg = Encoding.UTF8.GetString(msgMemory.Span);
|
||||||
Debug.Log($"收到的消息:{msg}");
|
//Debug.Log($"收到的消息:{msg}");
|
||||||
if (_messageHandlers.TryGetValue(type, out var handler))
|
if (_messageHandlers.TryGetValue(type, out var handler))
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
|||||||
@@ -217,7 +217,7 @@ public class UploadInfoToWeb : MonoBehaviour
|
|||||||
string json = JsonUtility.ToJson(watchVideoInfo);
|
string json = JsonUtility.ToJson(watchVideoInfo);
|
||||||
byte[] bytes = Encoding.UTF8.GetBytes(json);
|
byte[] bytes = Encoding.UTF8.GetBytes(json);
|
||||||
GameTools.WriteFile(fileName, bytes);
|
GameTools.WriteFile(fileName, bytes);
|
||||||
Debug.Log("<22><>¼<EFBFBD>ۿ<EFBFBD><DBBF><EFBFBD>Ϣ<EFBFBD>ɹ<EFBFBD>");
|
//Debug.Log("<22><>¼<EFBFBD>ۿ<EFBFBD><DBBF><EFBFBD>Ϣ<EFBFBD>ɹ<EFBFBD>");
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -235,12 +235,12 @@ public class UploadInfoToWeb : MonoBehaviour
|
|||||||
yield return request.SendWebRequest();
|
yield return request.SendWebRequest();
|
||||||
if (request.result != UnityWebRequest.Result.Success)
|
if (request.result != UnityWebRequest.Result.Success)
|
||||||
{
|
{
|
||||||
Debug.Log("<22><><EFBFBD>粻<EFBFBD><E7B2BB><EFBFBD>ã<EFBFBD><C3A3><EFBFBD><DEB7>ϴ<EFBFBD>ʹ<EFBFBD><CAB9><EFBFBD><EFBFBD>Ϣ");
|
//Debug.Log("<22><><EFBFBD>粻<EFBFBD><E7B2BB><EFBFBD>ã<EFBFBD><C3A3><EFBFBD><DEB7>ϴ<EFBFBD>ʹ<EFBFBD><CAB9><EFBFBD><EFBFBD>Ϣ");
|
||||||
yield break;
|
yield break;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Debug.Log("<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ã<EFBFBD><C3A3>ϴ<EFBFBD>ʹ<EFBFBD><CAB9><EFBFBD><EFBFBD>Ϣ<EFBFBD><CFA2>");
|
//Debug.Log("<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ã<EFBFBD><C3A3>ϴ<EFBFBD>ʹ<EFBFBD><CAB9><EFBFBD><EFBFBD>Ϣ<EFBFBD><CFA2>");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -272,13 +272,13 @@ public class UploadInfoToWeb : MonoBehaviour
|
|||||||
yield return req.SendWebRequest();
|
yield return req.SendWebRequest();
|
||||||
if (req.result == UnityWebRequest.Result.Success)
|
if (req.result == UnityWebRequest.Result.Success)
|
||||||
{
|
{
|
||||||
Debug.Log("<22>ϴ<EFBFBD><CFB4><EFBFBD><EFBFBD>عۿ<D8B9><DBBF><EFBFBD>Ϣ<EFBFBD>ɹ<EFBFBD>");
|
//Debug.Log("<22>ϴ<EFBFBD><CFB4><EFBFBD><EFBFBD>عۿ<D8B9><DBBF><EFBFBD>Ϣ<EFBFBD>ɹ<EFBFBD>");
|
||||||
File.Delete(path);//ɾ<><C9BE><EFBFBD><EFBFBD><EFBFBD>ؼ<EFBFBD>¼
|
File.Delete(path);//ɾ<><C9BE><EFBFBD><EFBFBD><EFBFBD>ؼ<EFBFBD>¼
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Debug.Log($"<22>ϴ<EFBFBD><CFB4><EFBFBD><EFBFBD>عۿ<D8B9>ʧ<EFBFBD><CAA7>!");
|
//Debug.Log($"<22>ϴ<EFBFBD><CFB4><EFBFBD><EFBFBD>عۿ<D8B9>ʧ<EFBFBD><CAA7>!");
|
||||||
Debug.Log($"<22><><EFBFBD><EFBFBD>ʧ<EFBFBD><CAA7>:{req.result}\r\n<><6E><EFBFBD><EFBFBD>:{req.error}\r\ncode:{req.responseCode}\r\ntext:{req.downloadHandler?.text}");
|
//Debug.Log($"<22><><EFBFBD><EFBFBD>ʧ<EFBFBD><CAA7>:{req.result}\r\n<><6E><EFBFBD><EFBFBD>:{req.error}\r\ncode:{req.responseCode}\r\ntext:{req.downloadHandler?.text}");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -141,6 +141,8 @@ PlayerSettings:
|
|||||||
bundleVersion: 1.0
|
bundleVersion: 1.0
|
||||||
preloadedAssets:
|
preloadedAssets:
|
||||||
- {fileID: 11400000, guid: 9e7be553448fa2546aea5752021cbcf7, type: 2}
|
- {fileID: 11400000, guid: 9e7be553448fa2546aea5752021cbcf7, type: 2}
|
||||||
|
- {fileID: -1506098009177567215, guid: f2f89e34580da664ea7627784c93a3d6, type: 2}
|
||||||
|
- {fileID: 11400000, guid: 846a6119e15216d4fbad905eb21e4169, type: 2}
|
||||||
metroInputSource: 0
|
metroInputSource: 0
|
||||||
wsaTransparentSwapchain: 0
|
wsaTransparentSwapchain: 0
|
||||||
m_HolographicPauseOnTrackingLoss: 1
|
m_HolographicPauseOnTrackingLoss: 1
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
{"deviceSN":"PA9412MGJC120200G","group_id":0,"resource_id":0,"device_id":0,"begin_at":"2025/11/15 14:27:27","end_at":"2025/11/15 14:32:39","duration":311,"times":1}
|
||||||
Reference in New Issue
Block a user