Compare commits

...

3 Commits

Author SHA1 Message Date
YangHua 7e185ed9f5 344 2024-05-30 09:49:30 +08:00
YangHua afcf813e35 55 2024-05-29 19:08:49 +08:00
YangHua 025aa08ddd 12 2024-05-29 17:42:59 +08:00
9 changed files with 22933 additions and 8268 deletions

View File

@ -37,13 +37,13 @@ AnimatorStateMachine:
m_ChildStates: m_ChildStates:
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: -6382282142163861838} m_State: {fileID: -6382282142163861838}
m_Position: {x: 200, y: 0, z: 0} m_Position: {x: 300, y: 190, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 5873917569391943574} m_State: {fileID: 5873917569391943574}
m_Position: {x: 480, y: 0, z: 0} m_Position: {x: 510, y: 130, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: -3921465590487093746} m_State: {fileID: -3921465590487093746}
m_Position: {x: 480, y: 130, z: 0} m_Position: {x: 520, y: 260, z: 0}
m_ChildStateMachines: [] m_ChildStateMachines: []
m_AnyStateTransitions: [] m_AnyStateTransitions: []
m_EntryTransitions: [] m_EntryTransitions: []
@ -88,7 +88,13 @@ AnimatorController:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: "\u8BA1\u91CF\u67DC\u67DC\u4F53_\u524D\u95E8\u96C6\u5408" m_Name: "\u8BA1\u91CF\u67DC\u67DC\u4F53_\u524D\u95E8\u96C6\u5408"
serializedVersion: 5 serializedVersion: 5
m_AnimatorParameters: [] m_AnimatorParameters:
- m_Name: OpenDoor
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_AnimatorLayers: m_AnimatorLayers:
- serializedVersion: 5 - serializedVersion: 5
m_Name: Base Layer m_Name: Base Layer

View File

@ -53,7 +53,7 @@ TextureImporter:
alphaUsage: 1 alphaUsage: 1
alphaIsTransparency: 0 alphaIsTransparency: 0
spriteTessellationDetail: -1 spriteTessellationDetail: -1
textureType: 0 textureType: 1
textureShape: 1 textureShape: 1
singleChannelComponent: 0 singleChannelComponent: 0
flipbookRows: 1 flipbookRows: 1

View File

@ -101,7 +101,8 @@ public class GameManager : MonoBehaviour
} }
else else
{ {
NiBianQi.gameObject.SetActive(false); if (NiBianQi != null)
NiBianQi.gameObject.SetActive(false);
} }
for (int i = 0; i < Inverter.Count; i++) for (int i = 0; i < Inverter.Count; i++)
{ {

View File

@ -27,6 +27,7 @@ public class ClampAmmetersInteractive : MonoBehaviour
void init() void init()
{ {
g1 = transform.GetChild(0).GetComponent<Transform>().gameObject; g1 = transform.GetChild(0).GetComponent<Transform>().gameObject;
name = g1.name;
} }
private void OnMouseDown() private void OnMouseDown()
{ {

View File

@ -3,11 +3,11 @@ using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using UnityEngine; using UnityEngine;
using UnityEngine.EventSystems; using UnityEngine.EventSystems;
using Vuplex.WebView; //using Vuplex.WebView;
public class newfollow : MonoBehaviour public class newfollow : MonoBehaviour
{ {
[SerializeField] string _name; [SerializeField] string _name;
public CanvasWebViewPrefab _focusedPrefab; //public CanvasWebViewPrefab _focusedPrefab;
public GameObject _canvas; public GameObject _canvas;
public bool isOnce = true; public bool isOnce = true;
@ -76,7 +76,7 @@ public class newfollow : MonoBehaviour
public void OpenWaiBuUrl(string _url) public void OpenWaiBuUrl(string _url)
{ {
//Application.OpenURL(url); //Application.OpenURL(url);
_focusedPrefab.InitialUrl = _url; //_focusedPrefab.InitialUrl = _url;
_canvas.gameObject.SetActive(true); _canvas.gameObject.SetActive(true);
} }
public void OnClose() public void OnClose()

View File

@ -7246,7 +7246,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 736, y: 0} m_AnchoredPosition: {x: 736, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 420.9, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &75116808 --- !u!114 &75116808
MonoBehaviour: MonoBehaviour:
@ -48991,7 +48991,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -834, y: 457} m_AnchoredPosition: {x: -834, y: 457}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 114, y: 57}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &614828590 --- !u!114 &614828590
MonoBehaviour: MonoBehaviour:
@ -115897,7 +115897,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!4 &1433083661 --- !u!4 &1433083661
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -1 +1 @@
Build from LGZN_H at 2024/5/27 9:28:06 Build from ADAM at 2024/5/29 23:00:35

View File

@ -724,7 +724,7 @@ PlayerSettings:
PS4: UNITY_POST_PROCESSING_STACK_V2 PS4: UNITY_POST_PROCESSING_STACK_V2
PS5: UNITY_POST_PROCESSING_STACK_V2 PS5: UNITY_POST_PROCESSING_STACK_V2
Stadia: UNITY_POST_PROCESSING_STACK_V2 Stadia: UNITY_POST_PROCESSING_STACK_V2
Standalone: UNITY_POST_PROCESSING_STACK_V2;AMPLIFY_SHADER_EDITOR;AQUAS_PRESENT;VUPLEX_STANDALONE Standalone: UNITY_POST_PROCESSING_STACK_V2;AMPLIFY_SHADER_EDITOR;AQUAS_PRESENT
WebGL: UNITY_POST_PROCESSING_STACK_V2 WebGL: UNITY_POST_PROCESSING_STACK_V2
Windows Store Apps: UNITY_POST_PROCESSING_STACK_V2 Windows Store Apps: UNITY_POST_PROCESSING_STACK_V2
XboxOne: UNITY_POST_PROCESSING_STACK_V2 XboxOne: UNITY_POST_PROCESSING_STACK_V2