This commit is contained in:
parent
e5ceff2775
commit
412f69f46d
|
|
@ -38,6 +38,7 @@ namespace Components
|
|||
panel.SetActive(false);
|
||||
selfBtn.onClick.AddListener(() =>
|
||||
{
|
||||
tips.SetActive(false);
|
||||
UIManager.Instance.toolsItemManager.SwictchToolPanel(false);
|
||||
if (modeName == ModeName.Panel)
|
||||
OnMobielSelf();
|
||||
|
|
|
|||
|
|
@ -45,6 +45,10 @@ public class ToolItem : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler
|
|||
showName = tips.transform.GetChild(0).GetComponent<Text>();
|
||||
closeButton.gameObject.SetActive(false);
|
||||
//countText.gameObject.SetActive(false);
|
||||
selfButton.onClick.AddListener(() =>
|
||||
{
|
||||
tips.SetActive(false);
|
||||
});
|
||||
}
|
||||
|
||||
public void SetValue(string name, Transform modelTransform, Vector3 pos, Vector3 Rot)
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ public class SceneLoad : MonoSingleton<SceneLoad>
|
|||
{
|
||||
isLoad = true;
|
||||
GlobalFlag.currentLoadSceneName = Scenename;
|
||||
Debug.Log("GlobalFlag.currentLoadSceneName=" + GlobalFlag.currentLoadSceneName);
|
||||
//Debug.Log("GlobalFlag.currentLoadSceneName=" + GlobalFlag.currentLoadSceneName);
|
||||
StartCoroutine(LoadScene(Scenename));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -149,7 +149,7 @@ public class ToolsItemManager : MonoSingleton<ToolsItemManager>
|
|||
|
||||
foreach (var item in mergedItems)
|
||||
{
|
||||
Debug.Log($"{item.Key}++{item.Value.Count}");
|
||||
//Debug.Log($"{item.Key}++{item.Value.Count}");
|
||||
if (!mergedItemsHave.ContainsKey(item.Key))
|
||||
{
|
||||
if (item.Value.Count > 1)
|
||||
|
|
@ -254,6 +254,16 @@ public class ToolsItemManager : MonoSingleton<ToolsItemManager>
|
|||
{
|
||||
GameManager.Instance.npcwayPoints.StartMove();
|
||||
}
|
||||
if (tool.name ==("钢丝钳(Clone)") && GameManager.Instance != null)
|
||||
{
|
||||
GameManager.Instance.FirstPersonController.enabled = true;
|
||||
GameManager.Instance.fengying.OnOver();
|
||||
}
|
||||
if (tool.name == ("螺丝刀_绝缘(Clone)") && GameManager.Instance != null)
|
||||
{
|
||||
GameManager.Instance.FirstPersonController.enabled = true;
|
||||
GameManager.Instance.AmmeterSon.OnOver();
|
||||
}
|
||||
Destroy(tool);
|
||||
}
|
||||
bottomToolToggle.interactable = true;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 541b70000cb064f4f92b0c07b94db92b
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,82 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 8
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: "\u5DE5\u5177\u95F4\u5C55\u677F"
|
||||
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_ValidKeywords:
|
||||
- _ALPHAPREMULTIPLY_ON
|
||||
m_InvalidKeywords: []
|
||||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: 3000
|
||||
stringTagMap:
|
||||
RenderType: Transparent
|
||||
disabledShaderPasses: []
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs:
|
||||
- _BumpMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _DetailAlbedoMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _DetailMask:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _DetailNormalMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _EmissionMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 2800000, guid: 98d4d528e85ac8d43b5e33e5e5490532, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MetallicGlossMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _OcclusionMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _ParallaxMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Ints: []
|
||||
m_Floats:
|
||||
- _BumpScale: 1
|
||||
- _Cutoff: 0.5
|
||||
- _DetailNormalMapScale: 1
|
||||
- _DstBlend: 10
|
||||
- _GlossMapScale: 1
|
||||
- _Glossiness: 0
|
||||
- _GlossyReflections: 1
|
||||
- _Metallic: 0
|
||||
- _Mode: 3
|
||||
- _OcclusionStrength: 1
|
||||
- _Parallax: 0.02
|
||||
- _SmoothnessTextureChannel: 0
|
||||
- _SpecularHighlights: 1
|
||||
- _SrcBlend: 1
|
||||
- _UVSec: 0
|
||||
- _ZWrite: 0
|
||||
m_Colors:
|
||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: b4a69f95129f8bd4f81220f3f7337a8c
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: d42b9c01affc1da4297d70fc56fe185b
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 449 KiB |
|
|
@ -0,0 +1,147 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 98d4d528e85ac8d43b5e33e5e5490532
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 12
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 1
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
ignoreMasterTextureLimit: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 1
|
||||
aniso: 1
|
||||
mipBias: 0
|
||||
wrapU: 0
|
||||
wrapV: 0
|
||||
wrapW: 0
|
||||
nPOTScale: 1
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 0
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 0
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 0
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
cookieLightType: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: Server
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: WebGL
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID:
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
nameFileIdTable: {}
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -0,0 +1,106 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 0ebd9a4abf52dc342a21c1fa77c39de3
|
||||
ModelImporter:
|
||||
serializedVersion: 21300
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
materials:
|
||||
materialImportMode: 1
|
||||
materialName: 0
|
||||
materialSearch: 1
|
||||
materialLocation: 0
|
||||
animations:
|
||||
legacyGenerateAnimations: 4
|
||||
bakeSimulation: 0
|
||||
resampleCurves: 1
|
||||
optimizeGameObjects: 0
|
||||
removeConstantScaleCurves: 1
|
||||
motionNodeName:
|
||||
rigImportErrors:
|
||||
rigImportWarnings:
|
||||
animationImportErrors:
|
||||
animationImportWarnings:
|
||||
animationRetargetingWarnings:
|
||||
animationDoRetargetingWarnings: 0
|
||||
importAnimatedCustomProperties: 0
|
||||
importConstraints: 0
|
||||
animationCompression: 1
|
||||
animationRotationError: 0.5
|
||||
animationPositionError: 0.5
|
||||
animationScaleError: 0.5
|
||||
animationWrapMode: 0
|
||||
extraExposedTransformPaths: []
|
||||
extraUserProperties: []
|
||||
clipAnimations: []
|
||||
isReadable: 0
|
||||
meshes:
|
||||
lODScreenPercentages: []
|
||||
globalScale: 1
|
||||
meshCompression: 0
|
||||
addColliders: 0
|
||||
useSRGBMaterialColor: 1
|
||||
sortHierarchyByName: 1
|
||||
importVisibility: 1
|
||||
importBlendShapes: 1
|
||||
importCameras: 1
|
||||
importLights: 1
|
||||
nodeNameCollisionStrategy: 1
|
||||
fileIdsGeneration: 2
|
||||
swapUVChannels: 0
|
||||
generateSecondaryUV: 0
|
||||
useFileUnits: 1
|
||||
keepQuads: 0
|
||||
weldVertices: 1
|
||||
bakeAxisConversion: 0
|
||||
preserveHierarchy: 0
|
||||
skinWeightsMode: 0
|
||||
maxBonesPerVertex: 4
|
||||
minBoneWeight: 0.001
|
||||
optimizeBones: 1
|
||||
meshOptimizationFlags: -1
|
||||
indexFormat: 0
|
||||
secondaryUVAngleDistortion: 8
|
||||
secondaryUVAreaDistortion: 15.000001
|
||||
secondaryUVHardAngle: 88
|
||||
secondaryUVMarginMethod: 1
|
||||
secondaryUVMinLightmapResolution: 40
|
||||
secondaryUVMinObjectScale: 1
|
||||
secondaryUVPackMargin: 4
|
||||
useFileScale: 1
|
||||
tangentSpace:
|
||||
normalSmoothAngle: 60
|
||||
normalImportMode: 0
|
||||
tangentImportMode: 3
|
||||
normalCalculationMode: 4
|
||||
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
|
||||
blendShapeNormalImportMode: 1
|
||||
normalSmoothingSource: 0
|
||||
referencedClips: []
|
||||
importAnimation: 1
|
||||
humanDescription:
|
||||
serializedVersion: 3
|
||||
human: []
|
||||
skeleton: []
|
||||
armTwist: 0.5
|
||||
foreArmTwist: 0.5
|
||||
upperLegTwist: 0.5
|
||||
legTwist: 0.5
|
||||
armStretch: 0.05
|
||||
legStretch: 0.05
|
||||
feetSpacing: 0
|
||||
globalScale: 1
|
||||
rootMotionBoneName:
|
||||
hasTranslationDoF: 0
|
||||
hasExtraRoot: 0
|
||||
skeletonHasParents: 1
|
||||
lastHumanDescriptionAvatarSource: {instanceID: 0}
|
||||
autoGenerateAvatarMappingIfUnspecified: 1
|
||||
animationType: 2
|
||||
humanoidOversampling: 1
|
||||
avatarSetup: 0
|
||||
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
|
||||
remapMaterialsIfMaterialImportModeIsNone: 0
|
||||
additionalBone: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -1,25 +1,54 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using DG.Tweening;
|
||||
|
||||
public class AmmeterSon : MonoBehaviour
|
||||
{
|
||||
public string name;
|
||||
[SerializeField] AmmeterSon ammeterSon;
|
||||
public bool Run = false;
|
||||
public Vector3 newPos = Vector3.zero;
|
||||
public Vector3 newAngle = Vector3.zero;
|
||||
private void Start()
|
||||
{
|
||||
Debug.Log($"DoolsPlayer==={gameObject.name}");
|
||||
}
|
||||
private void OnMouseDown()
|
||||
{
|
||||
if (Run)
|
||||
{
|
||||
gameObject.SetActive(false);
|
||||
if (ammeterSon != null)
|
||||
if (name == "ÂÝË¿")
|
||||
{
|
||||
ammeterSon.enabled = true;
|
||||
ammeterSon.GetComponent<AmmeterSon>().Run = true;
|
||||
GameObject obj = GameManager.Instance.temp;
|
||||
if (obj != null && obj.name == "ÂÝË¿µ¶_¾øÔµ(Clone)")
|
||||
{
|
||||
GameManager.Instance.FirstPersonController.enabled = false;
|
||||
obj.transform.DORotate(newAngle, 0.5f);
|
||||
obj.transform.DOMove(newPos, 1f).OnComplete(() =>
|
||||
{
|
||||
gameObject.SetActive(false);
|
||||
});
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
gameObject.SetActive(false);
|
||||
if (ammeterSon != null)
|
||||
{
|
||||
ammeterSon.enabled = true;
|
||||
ammeterSon.GetComponent<AmmeterSon>().Run = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
public void OnOver()
|
||||
{
|
||||
gameObject.SetActive(false);
|
||||
if (ammeterSon != null)
|
||||
{
|
||||
ammeterSon.enabled = true;
|
||||
ammeterSon.GetComponent<AmmeterSon>().Run = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,6 +8,8 @@ public class CameraControl : MonoBehaviour
|
|||
public Camera playerCamera;
|
||||
private void Update()
|
||||
{
|
||||
if (GameManager.Instance.temp != null && GameManager.Instance.temp.name.Equals("멀介풂(Clone)")) return;
|
||||
if (GameManager.Instance.temp != null && GameManager.Instance.temp.name.Equals("쭁介독_없鍍(Clone)")) return;
|
||||
fieldView = playerCamera.fieldOfView;
|
||||
fieldView -= Input.GetAxis("Mouse ScrollWheel") * 10f;
|
||||
fieldView = Mathf.Clamp(fieldView, 20, 60);
|
||||
|
|
@ -28,14 +30,14 @@ public class CameraControl : MonoBehaviour
|
|||
GameManager.Instance.temp.transform.localPosition = new Vector3(0.04f, 0.55f, 0.81f);
|
||||
break;
|
||||
case 6:
|
||||
GameManager.Instance.temp.transform.localPosition = new Vector3(0.12f, 0.46f, 0.81f);
|
||||
GameManager.Instance.temp.transform.localPosition = new Vector3(0.251f, 0.46f, 0.532f);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,18 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using DG.Tweening;
|
||||
|
||||
public class DoolsPlayer : MonoBehaviour
|
||||
{
|
||||
public door_control mesh;
|
||||
public MeshCollider _collider;
|
||||
public bool ison = false;
|
||||
public string currentObjName;
|
||||
public Vector3 newPos = Vector3.zero;
|
||||
public Vector3 newAngle = Vector3.zero;
|
||||
// Start is called before the first frame update
|
||||
void Awake()
|
||||
private void Awake()
|
||||
{
|
||||
mesh.ÆôÓý»»¥ = false;
|
||||
_collider = mesh.GetComponent<MeshCollider>();
|
||||
|
|
@ -17,15 +21,32 @@ public class DoolsPlayer : MonoBehaviour
|
|||
{
|
||||
if (ison)
|
||||
{
|
||||
mesh.enabled = true;
|
||||
//mesh.FengYing = true;
|
||||
_collider.enabled = true;
|
||||
gameObject.SetActive(false);
|
||||
if (GameManager.Instance)
|
||||
if (currentObjName == "·âÓ¡")
|
||||
{
|
||||
GameManager.Instance.interactiveEnum = Interactive.none;
|
||||
GameObject obj = GameManager.Instance.temp;
|
||||
if (obj != null && obj.name == "¸Ö˿ǯ(Clone)")
|
||||
{
|
||||
GameManager.Instance.FirstPersonController.enabled = false;
|
||||
obj.transform.DORotate(newAngle, 0.5f);
|
||||
obj.transform.DOMove(newPos, 1f).OnComplete(() =>
|
||||
{
|
||||
gameObject.SetActive(false);
|
||||
});
|
||||
}
|
||||
}
|
||||
GameManager.Instance.YanDian = true;
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
public void OnOver()
|
||||
{
|
||||
mesh.enabled = true;
|
||||
//mesh.FengYing = true;
|
||||
_collider.enabled = true;
|
||||
if (GameManager.Instance)
|
||||
{
|
||||
GameManager.Instance.interactiveEnum = Interactive.none;
|
||||
}
|
||||
GameManager.Instance.YanDian = true;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ public class GameManager : MonoBehaviour
|
|||
public Image MultimeterIm;
|
||||
public Image DianFuIm;
|
||||
public Text DianFuTex;
|
||||
[SerializeField] FirstPersonController FirstPersonController;
|
||||
public FirstPersonController FirstPersonController;
|
||||
public string SceneName;
|
||||
public GameObject GanTan;
|
||||
public bool GonZuoZheng = false;
|
||||
|
|
@ -56,6 +56,8 @@ public class GameManager : MonoBehaviour
|
|||
private Vector3 lastPlayerPos = new Vector3();
|
||||
private Vector3 lastPlayereugle = new Vector3();
|
||||
public NPCWaypoints npcwayPoints;
|
||||
public DoolsPlayer fengying;
|
||||
public AmmeterSon AmmeterSon;
|
||||
public void Awake()
|
||||
{
|
||||
if (Instance != null)
|
||||
|
|
@ -134,7 +136,7 @@ public class GameManager : MonoBehaviour
|
|||
{
|
||||
lastPlayerPos = FirstPersonController.transform.position;
|
||||
lastPlayereugle = FirstPersonController.transform.eulerAngles;
|
||||
Debug.Log("upLadder");
|
||||
//Debug.Log("upLadder");
|
||||
FirstPersonController.transform.position = ladderCtr.playerPos.position;
|
||||
FirstPersonController.transform.eulerAngles = ladderCtr.playerPos.eulerAngles;
|
||||
FirstPersonController.GetComponent<Rigidbody>().useGravity = false;
|
||||
|
|
@ -233,7 +235,7 @@ public class GameManager : MonoBehaviour
|
|||
/// <summary>
|
||||
/// ¹¤¾ßÉú³É·½·¨
|
||||
/// </summary>
|
||||
public async void ToolsShow(GameObject tools)
|
||||
public void ToolsShow(GameObject tools)
|
||||
{
|
||||
if (Camera.main)
|
||||
{
|
||||
|
|
@ -248,13 +250,13 @@ public class GameManager : MonoBehaviour
|
|||
Destroy(temp.gameObject);
|
||||
}
|
||||
temp = Instantiate(tools, Player.transform);
|
||||
temp.transform.localPosition = new Vector3(0.12f, 0.46f, 0.81f);
|
||||
temp.transform.localPosition = new Vector3(0.251f, 0.46f, 0.532f);
|
||||
UIManager.Instance.toolsItemManager.currentTool = temp;
|
||||
string name = Filter(temp.name, TempChar);
|
||||
if (FractionManager.Instance && GlobalFlag.userType == "Òì³£")
|
||||
{
|
||||
await FractionManager.Instance.overAsync(6, 10, "²âÁ¿ÇÔµçµã");
|
||||
}
|
||||
//if (FractionManager.Instance && GlobalFlag.userType == "异常")
|
||||
//{
|
||||
// //await FractionManager.Instance.overAsync(6, 10, "测量窃电点");
|
||||
//}
|
||||
redData = "";
|
||||
DianFuTex.text = "-";
|
||||
switch (name)
|
||||
|
|
@ -291,8 +293,21 @@ public class GameManager : MonoBehaviour
|
|||
temp.GetComponent<AmpereMeter>().im = XiangWeiUI;
|
||||
FuAnBiao = temp;
|
||||
break;
|
||||
case "钢丝钳":
|
||||
//interactiveEnum = Interactive.YanDian;
|
||||
temp.transform.localPosition = new Vector3(0.296f, 0.504f, 0.504f);
|
||||
temp.GetComponent<Collider>().enabled = false;
|
||||
//temp.AddComponent<TestPenInteractive>();
|
||||
break;
|
||||
case "螺丝刀_绝缘":
|
||||
//interactiveEnum = Interactive.YanDian;
|
||||
temp.transform.localPosition = new Vector3(0.296f, 0.504f, 0.504f);
|
||||
temp.GetComponent<Collider>().enabled = false;
|
||||
//temp.AddComponent<TestPenInteractive>();
|
||||
break;
|
||||
default:
|
||||
Insta(temp);
|
||||
temp.GetComponent<Collider>().enabled = false;
|
||||
WanStopValve.gameObject.SetActive(false);
|
||||
QianStopValve.gameObject.SetActive(false);
|
||||
break;
|
||||
|
|
@ -307,7 +322,7 @@ public class GameManager : MonoBehaviour
|
|||
/// </summary>
|
||||
public void Insta(GameObject GameObj)
|
||||
{
|
||||
GameObj.transform.localPosition = new Vector3(Player.transform.position.x + 0.43f, Player.transform.position.y + 0.66f, Player.transform.position.z + 1.5f);
|
||||
GameObj.transform.localPosition = new Vector3(Player.transform.position.x + 0.525f, Player.transform.position.y + 0.66f, Player.transform.position.z + 1f);
|
||||
}
|
||||
private void OnDestroy()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ public class TestPenInteractive : MonoBehaviour
|
|||
{
|
||||
if (hit.collider.transform.tag.Equals("YanDian"))
|
||||
{
|
||||
GameManager.Instance.FirstPersonController.enabled = false;
|
||||
//transform.parent = hit.collider.transform;
|
||||
PenMove(hit.point);
|
||||
isOver = false;
|
||||
|
|
@ -75,12 +76,13 @@ public class TestPenInteractive : MonoBehaviour
|
|||
{
|
||||
DG.Tweening.Sequence sequence = DOTween.Sequence();
|
||||
sequence.Append(transform.DOMove(hitPoint, 1f))
|
||||
.AppendInterval(1.5f)
|
||||
.AppendInterval(1.5f)
|
||||
.AppendCallback(() =>
|
||||
{
|
||||
isOver = true;
|
||||
GameManager.Instance.FirstPersonController.enabled = true;
|
||||
});
|
||||
sequence.Play();
|
||||
sequence.Play();
|
||||
|
||||
//transform.DOMove(hitPoint, 1f).OnComplete(() =>
|
||||
// {
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -112,7 +112,7 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 3a104cb69d531064393bd332a91432cd, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
attribute: 1
|
||||
attribute: 2
|
||||
rightAndWrong: 1
|
||||
wearAnduse: 2
|
||||
onEnter:
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 3a104cb69d531064393bd332a91432cd, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
attribute: 1
|
||||
attribute: 2
|
||||
rightAndWrong: 2
|
||||
wearAnduse: 2
|
||||
onEnter:
|
||||
|
|
|
|||
|
|
@ -174,7 +174,7 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 3a104cb69d531064393bd332a91432cd, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
attribute: 1
|
||||
attribute: 2
|
||||
rightAndWrong: 2
|
||||
wearAnduse: 2
|
||||
onEnter:
|
||||
|
|
|
|||
|
|
@ -174,7 +174,7 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 3a104cb69d531064393bd332a91432cd, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
attribute: 1
|
||||
attribute: 2
|
||||
rightAndWrong: 2
|
||||
wearAnduse: 2
|
||||
onEnter:
|
||||
|
|
|
|||
|
|
@ -1820,6 +1820,17 @@ Transform:
|
|||
m_Father: {fileID: 1899647146}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 184.378, z: 0}
|
||||
--- !u!114 &337037222 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 8085560928181544314, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
|
||||
m_PrefabInstance: {fileID: 475266403}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1b7105d1f10415c419458fa7df96cb55, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1001 &371042551
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2373,6 +2384,42 @@ PrefabInstance:
|
|||
propertyPath: selChildName
|
||||
value: "\u7528\u7535_AA3"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7849094048930059152, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7849094048930059153, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
|
||||
propertyPath: newPos.x
|
||||
value: 30.48
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7849094048930059153, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
|
||||
propertyPath: newPos.y
|
||||
value: 1.4589
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7849094048930059153, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
|
||||
propertyPath: newPos.z
|
||||
value: -305.903
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7849094048930059153, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
|
||||
propertyPath: newAngle.x
|
||||
value: -20
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7849094048930059153, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
|
||||
propertyPath: currentObjName
|
||||
value: "\u5C01\u5370"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8085560928181544314, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
|
||||
propertyPath: newPos.x
|
||||
value: 30.3846
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8085560928181544314, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
|
||||
propertyPath: newPos.y
|
||||
value: 1.3763
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8085560928181544314, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
|
||||
propertyPath: newPos.z
|
||||
value: -305.8216
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8149241991452967759, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
|
||||
propertyPath: selChildName
|
||||
value: "\u7528\u7535_BA3"
|
||||
|
|
@ -6357,6 +6404,17 @@ Transform:
|
|||
m_CorrespondingSourceObject: {fileID: 400000, guid: 5867990de5f59415ebd61940a40606b9, type: 3}
|
||||
m_PrefabInstance: {fileID: 1362873873}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &1380257621 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 7849094048930059153, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
|
||||
m_PrefabInstance: {fileID: 475266403}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 7f237fec74345e543bb3e10ae90aebb6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1001 &1404963186
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -9418,6 +9476,10 @@ PrefabInstance:
|
|||
propertyPath: NiBianQi
|
||||
value:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3497283653043674448, guid: ae8abf8c4406dc749837eda21c6b1c60, type: 3}
|
||||
propertyPath: fengying
|
||||
value:
|
||||
objectReference: {fileID: 1380257621}
|
||||
- target: {fileID: 3497283653043674448, guid: ae8abf8c4406dc749837eda21c6b1c60, type: 3}
|
||||
propertyPath: toolsCam
|
||||
value:
|
||||
|
|
@ -9426,6 +9488,10 @@ PrefabInstance:
|
|||
propertyPath: DianFuTex
|
||||
value:
|
||||
objectReference: {fileID: 1874428843}
|
||||
- target: {fileID: 3497283653043674448, guid: ae8abf8c4406dc749837eda21c6b1c60, type: 3}
|
||||
propertyPath: AmmeterSon
|
||||
value:
|
||||
objectReference: {fileID: 337037222}
|
||||
- target: {fileID: 3497283653043674448, guid: ae8abf8c4406dc749837eda21c6b1c60, type: 3}
|
||||
propertyPath: XiangWeiUI
|
||||
value:
|
||||
|
|
|
|||
|
|
@ -3913,6 +3913,50 @@ PrefabInstance:
|
|||
propertyPath: selChildName
|
||||
value: "\u7528\u7535_AA3"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7849094048930059153, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
|
||||
propertyPath: newPos.x
|
||||
value: -27.663
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7849094048930059153, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
|
||||
propertyPath: newPos.y
|
||||
value: 1.292
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7849094048930059153, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
|
||||
propertyPath: newPos.z
|
||||
value: 20.391
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7849094048930059153, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
|
||||
propertyPath: newAngle.x
|
||||
value: -20
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7849094048930059153, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
|
||||
propertyPath: newAngle.y
|
||||
value: -90
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7849094048930059153, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
|
||||
propertyPath: currentObjName
|
||||
value: "\u5C01\u5370"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8085560928181544314, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
|
||||
propertyPath: newPos.x
|
||||
value: -27.7481
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8085560928181544314, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
|
||||
propertyPath: newPos.y
|
||||
value: 1.1964
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8085560928181544314, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
|
||||
propertyPath: newPos.z
|
||||
value: 20.3025
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8085560928181544314, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
|
||||
propertyPath: newAngle.y
|
||||
value: -90
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8085560928181544314, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
|
||||
propertyPath: newAngle.z
|
||||
value: 90
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8149241991452967759, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
|
||||
propertyPath: selChildName
|
||||
value: "\u7528\u7535_BA3"
|
||||
|
|
@ -3937,6 +3981,28 @@ Transform:
|
|||
m_CorrespondingSourceObject: {fileID: 7259663021768945234, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
|
||||
m_PrefabInstance: {fileID: 145989168677619372}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &145989168677619375 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 7849094048930059153, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
|
||||
m_PrefabInstance: {fileID: 145989168677619372}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 7f237fec74345e543bb3e10ae90aebb6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &145989168677619376 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 8085560928181544314, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
|
||||
m_PrefabInstance: {fileID: 145989168677619372}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1b7105d1f10415c419458fa7df96cb55, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!20 &1020671387576034506 stripped
|
||||
Camera:
|
||||
m_CorrespondingSourceObject: {fileID: 7987186903484630082, guid: fd7bf7d1951db7d45837e40450a11ddc, type: 3}
|
||||
|
|
@ -4144,6 +4210,10 @@ PrefabInstance:
|
|||
propertyPath: NiBianQi
|
||||
value:
|
||||
objectReference: {fileID: 1165779926}
|
||||
- target: {fileID: 3497283653043674448, guid: ae8abf8c4406dc749837eda21c6b1c60, type: 3}
|
||||
propertyPath: fengying
|
||||
value:
|
||||
objectReference: {fileID: 145989168677619375}
|
||||
- target: {fileID: 3497283653043674448, guid: ae8abf8c4406dc749837eda21c6b1c60, type: 3}
|
||||
propertyPath: toolsCam
|
||||
value:
|
||||
|
|
@ -4152,6 +4222,10 @@ PrefabInstance:
|
|||
propertyPath: DianFuTex
|
||||
value:
|
||||
objectReference: {fileID: 1874428843}
|
||||
- target: {fileID: 3497283653043674448, guid: ae8abf8c4406dc749837eda21c6b1c60, type: 3}
|
||||
propertyPath: AmmeterSon
|
||||
value:
|
||||
objectReference: {fileID: 145989168677619376}
|
||||
- target: {fileID: 3497283653043674448, guid: ae8abf8c4406dc749837eda21c6b1c60, type: 3}
|
||||
propertyPath: XiangWeiUI
|
||||
value:
|
||||
|
|
|
|||
|
|
@ -63594,6 +63594,10 @@ PrefabInstance:
|
|||
propertyPath: DianFuIm
|
||||
value:
|
||||
objectReference: {fileID: 1914722636}
|
||||
- target: {fileID: 3497283653043674448, guid: ae8abf8c4406dc749837eda21c6b1c60, type: 3}
|
||||
propertyPath: fengying
|
||||
value:
|
||||
objectReference: {fileID: 1752107307}
|
||||
- target: {fileID: 3497283653043674448, guid: ae8abf8c4406dc749837eda21c6b1c60, type: 3}
|
||||
propertyPath: toolsCam
|
||||
value:
|
||||
|
|
@ -63602,6 +63606,10 @@ PrefabInstance:
|
|||
propertyPath: DianFuTex
|
||||
value:
|
||||
objectReference: {fileID: 1914722635}
|
||||
- target: {fileID: 3497283653043674448, guid: ae8abf8c4406dc749837eda21c6b1c60, type: 3}
|
||||
propertyPath: AmmeterSon
|
||||
value:
|
||||
objectReference: {fileID: 1752107308}
|
||||
- target: {fileID: 3497283653043674448, guid: ae8abf8c4406dc749837eda21c6b1c60, type: 3}
|
||||
propertyPath: XiangWeiUI
|
||||
value:
|
||||
|
|
@ -95633,6 +95641,10 @@ PrefabInstance:
|
|||
m_Modification:
|
||||
m_TransformParent: {fileID: 259191374}
|
||||
m_Modifications:
|
||||
- target: {fileID: 697199240130630432, guid: 0e90fa63ba3e56749b502a9a4e00b64f, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1281350692733807052, guid: 0e90fa63ba3e56749b502a9a4e00b64f, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 0
|
||||
|
|
@ -95677,6 +95689,62 @@ PrefabInstance:
|
|||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1741256891908648251, guid: 0e90fa63ba3e56749b502a9a4e00b64f, type: 3}
|
||||
propertyPath: newPos.x
|
||||
value: -2.108
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1741256891908648251, guid: 0e90fa63ba3e56749b502a9a4e00b64f, type: 3}
|
||||
propertyPath: newPos.y
|
||||
value: 1.434
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1741256891908648251, guid: 0e90fa63ba3e56749b502a9a4e00b64f, type: 3}
|
||||
propertyPath: newPos.z
|
||||
value: 313.238
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1741256891908648251, guid: 0e90fa63ba3e56749b502a9a4e00b64f, type: 3}
|
||||
propertyPath: newAngle.x
|
||||
value: -20
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1741256891908648251, guid: 0e90fa63ba3e56749b502a9a4e00b64f, type: 3}
|
||||
propertyPath: newAngle.y
|
||||
value: -90
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1741256891908648251, guid: 0e90fa63ba3e56749b502a9a4e00b64f, type: 3}
|
||||
propertyPath: currentObjName
|
||||
value: "\u5C01\u5370"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3070703378113853310, guid: 0e90fa63ba3e56749b502a9a4e00b64f, type: 3}
|
||||
propertyPath: Run
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3070703378113853310, guid: 0e90fa63ba3e56749b502a9a4e00b64f, type: 3}
|
||||
propertyPath: newPos.x
|
||||
value: -2.0858
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3070703378113853310, guid: 0e90fa63ba3e56749b502a9a4e00b64f, type: 3}
|
||||
propertyPath: newPos.y
|
||||
value: 1.5646
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3070703378113853310, guid: 0e90fa63ba3e56749b502a9a4e00b64f, type: 3}
|
||||
propertyPath: newPos.z
|
||||
value: 313.0661
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3070703378113853310, guid: 0e90fa63ba3e56749b502a9a4e00b64f, type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3070703378113853310, guid: 0e90fa63ba3e56749b502a9a4e00b64f, type: 3}
|
||||
propertyPath: newAngle.x
|
||||
value: -180
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3070703378113853310, guid: 0e90fa63ba3e56749b502a9a4e00b64f, type: 3}
|
||||
propertyPath: newAngle.y
|
||||
value: 90
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3070703378113853310, guid: 0e90fa63ba3e56749b502a9a4e00b64f, type: 3}
|
||||
propertyPath: newAngle.z
|
||||
value: -90
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3191021980637115612, guid: 0e90fa63ba3e56749b502a9a4e00b64f, type: 3}
|
||||
propertyPath: selChildName
|
||||
value: "\u7528\u7535_AA2"
|
||||
|
|
@ -95709,6 +95777,28 @@ GameObject:
|
|||
m_CorrespondingSourceObject: {fileID: 6340578653018048517, guid: 0e90fa63ba3e56749b502a9a4e00b64f, type: 3}
|
||||
m_PrefabInstance: {fileID: 1752107304}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &1752107307 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 1741256891908648251, guid: 0e90fa63ba3e56749b502a9a4e00b64f, type: 3}
|
||||
m_PrefabInstance: {fileID: 1752107304}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 7f237fec74345e543bb3e10ae90aebb6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &1752107308 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 3070703378113853310, guid: 0e90fa63ba3e56749b502a9a4e00b64f, type: 3}
|
||||
m_PrefabInstance: {fileID: 1752107304}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1b7105d1f10415c419458fa7df96cb55, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1001 &1752817322
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -1206,6 +1206,10 @@ PrefabInstance:
|
|||
propertyPath: DianFuIm
|
||||
value:
|
||||
objectReference: {fileID: 1075199323}
|
||||
- target: {fileID: 3497283653043674448, guid: ae8abf8c4406dc749837eda21c6b1c60, type: 3}
|
||||
propertyPath: fengying
|
||||
value:
|
||||
objectReference: {fileID: 625695120}
|
||||
- target: {fileID: 3497283653043674448, guid: ae8abf8c4406dc749837eda21c6b1c60, type: 3}
|
||||
propertyPath: toolsCam
|
||||
value:
|
||||
|
|
@ -1222,6 +1226,10 @@ PrefabInstance:
|
|||
propertyPath: ladderPos
|
||||
value:
|
||||
objectReference: {fileID: 55952628}
|
||||
- target: {fileID: 3497283653043674448, guid: ae8abf8c4406dc749837eda21c6b1c60, type: 3}
|
||||
propertyPath: AmmeterSon
|
||||
value:
|
||||
objectReference: {fileID: 625695121}
|
||||
- target: {fileID: 3497283653043674448, guid: ae8abf8c4406dc749837eda21c6b1c60, type: 3}
|
||||
propertyPath: XiangWeiUI
|
||||
value:
|
||||
|
|
@ -2819,6 +2827,50 @@ PrefabInstance:
|
|||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1004773545377646679, guid: 80a535495f0b55244915304bf74ec211, type: 3}
|
||||
propertyPath: newPos.x
|
||||
value: 10.8619
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1004773545377646679, guid: 80a535495f0b55244915304bf74ec211, type: 3}
|
||||
propertyPath: newPos.y
|
||||
value: -1.6101
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1004773545377646679, guid: 80a535495f0b55244915304bf74ec211, type: 3}
|
||||
propertyPath: newPos.z
|
||||
value: -17.798
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1004773545377646679, guid: 80a535495f0b55244915304bf74ec211, type: 3}
|
||||
propertyPath: newAngle.x
|
||||
value: -180
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2944256602477513329, guid: 80a535495f0b55244915304bf74ec211, type: 3}
|
||||
propertyPath: newPos.x
|
||||
value: 10.6136
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2944256602477513329, guid: 80a535495f0b55244915304bf74ec211, type: 3}
|
||||
propertyPath: newPos.y
|
||||
value: -1.7062
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2944256602477513329, guid: 80a535495f0b55244915304bf74ec211, type: 3}
|
||||
propertyPath: newPos.z
|
||||
value: -17.8221
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2944256602477513329, guid: 80a535495f0b55244915304bf74ec211, type: 3}
|
||||
propertyPath: newAngle.x
|
||||
value: -20
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2944256602477513329, guid: 80a535495f0b55244915304bf74ec211, type: 3}
|
||||
propertyPath: newAngle.y
|
||||
value: 180
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2944256602477513329, guid: 80a535495f0b55244915304bf74ec211, type: 3}
|
||||
propertyPath: newAngle.z
|
||||
value: 179
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2944256602477513329, guid: 80a535495f0b55244915304bf74ec211, type: 3}
|
||||
propertyPath: currentObjName
|
||||
value: "\u5C01\u5370"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4622935324791208896, guid: 80a535495f0b55244915304bf74ec211, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: "\u7535\u7EBF\u6746-\u4F4E\u538B"
|
||||
|
|
@ -2906,6 +2958,28 @@ GameObject:
|
|||
m_CorrespondingSourceObject: {fileID: 1010813967426892947, guid: 80a535495f0b55244915304bf74ec211, type: 3}
|
||||
m_PrefabInstance: {fileID: 625695118}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &625695120 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 2944256602477513329, guid: 80a535495f0b55244915304bf74ec211, type: 3}
|
||||
m_PrefabInstance: {fileID: 625695118}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 7f237fec74345e543bb3e10ae90aebb6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &625695121 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 1004773545377646679, guid: 80a535495f0b55244915304bf74ec211, type: 3}
|
||||
m_PrefabInstance: {fileID: 625695118}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1b7105d1f10415c419458fa7df96cb55, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1001 &628079010
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -145720,6 +145720,10 @@ PrefabInstance:
|
|||
propertyPath: DianFuIm
|
||||
value:
|
||||
objectReference: {fileID: 1156989516}
|
||||
- target: {fileID: 3497283653043674448, guid: ae8abf8c4406dc749837eda21c6b1c60, type: 3}
|
||||
propertyPath: fengying
|
||||
value:
|
||||
objectReference: {fileID: 716420606400252000}
|
||||
- target: {fileID: 3497283653043674448, guid: ae8abf8c4406dc749837eda21c6b1c60, type: 3}
|
||||
propertyPath: toolsCam
|
||||
value:
|
||||
|
|
@ -145732,6 +145736,10 @@ PrefabInstance:
|
|||
propertyPath: ladderCtr
|
||||
value:
|
||||
objectReference: {fileID: 2144221092}
|
||||
- target: {fileID: 3497283653043674448, guid: ae8abf8c4406dc749837eda21c6b1c60, type: 3}
|
||||
propertyPath: AmmeterSon
|
||||
value:
|
||||
objectReference: {fileID: 716420606400252001}
|
||||
- target: {fileID: 3497283653043674448, guid: ae8abf8c4406dc749837eda21c6b1c60, type: 3}
|
||||
propertyPath: XiangWeiUI
|
||||
value:
|
||||
|
|
@ -155449,6 +155457,10 @@ PrefabInstance:
|
|||
propertyPath: selChildName
|
||||
value: "\u7528\u7535_BA3"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2605245425263517801, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3279334675836538692, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
|
||||
propertyPath: selChildName
|
||||
value: "\u7528\u7535_AA2"
|
||||
|
|
@ -155549,6 +155561,30 @@ PrefabInstance:
|
|||
propertyPath: selChildName
|
||||
value: "\u7528\u7535_CA2"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6133102330868115339, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
|
||||
propertyPath: newPos.x
|
||||
value: 59.61099
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6133102330868115339, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
|
||||
propertyPath: newPos.y
|
||||
value: 2.353
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6133102330868115339, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
|
||||
propertyPath: newPos.z
|
||||
value: 347.5375
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6133102330868115339, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
|
||||
propertyPath: newAngle.x
|
||||
value: -20
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6133102330868115339, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
|
||||
propertyPath: newAngle.y
|
||||
value: -0.9
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6133102330868115339, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
|
||||
propertyPath: currentObjName
|
||||
value: "\u5C01\u5370"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7054410357581551140, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
|
||||
propertyPath: selChildName
|
||||
value: "\u7528\u7535_CA3"
|
||||
|
|
@ -155565,6 +155601,18 @@ PrefabInstance:
|
|||
propertyPath: selChildName
|
||||
value: "\u7528\u7535_CA2"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8894670206438856409, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
|
||||
propertyPath: newPos.x
|
||||
value: 59.5717
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8894670206438856409, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
|
||||
propertyPath: newPos.y
|
||||
value: 2.5739
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8894670206438856409, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
|
||||
propertyPath: newPos.z
|
||||
value: 347.5128
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
|
||||
--- !u!1 &716420606400251998 stripped
|
||||
|
|
@ -155577,6 +155625,28 @@ GameObject:
|
|||
m_CorrespondingSourceObject: {fileID: 2702006292506422886, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
|
||||
m_PrefabInstance: {fileID: 716420606400251997}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &716420606400252000 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 6133102330868115339, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
|
||||
m_PrefabInstance: {fileID: 716420606400251997}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 7f237fec74345e543bb3e10ae90aebb6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &716420606400252001 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 8894670206438856409, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
|
||||
m_PrefabInstance: {fileID: 716420606400251997}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1b7105d1f10415c419458fa7df96cb55, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!4 &716729920141992819
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1 +1 @@
|
|||
Build from ADAM at 2024/7/23 18:28:57
|
||||
Build from ADAM at 2024/7/25 15:04:04
|
||||
|
|
@ -1 +1 @@
|
|||
2024-06-13 09:04:45#'sxfz://;swxdygpb,0,41,1,username,token,90,1,622,http://21e78de3.r27.cpolar.top;/'|
|
||||
2024-06-13 09:04:45#'sxfz://;swxdygpb,0,41,1,username,token,90,1,622,http://607e6315.r27.cpolar.top;/'|
|
||||
Loading…
Reference in New Issue