Compare commits

..

No commits in common. "69f42b46fa0a0f6e708bda6fa202de3642c4c4fb" and "272dc3f8f46e9f9a706e6ede690d555ad4694abe" have entirely different histories.

18 changed files with 479 additions and 2381 deletions

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: f8ba2921d2c970b4ca78af007284e752
timeCreated: 1511375318
licenseType: Store
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
isPreloaded: 0
isOverridable: 0
platformData:
- first:
'': Any
second:
enabled: 0
settings:
Exclude Android: 1
Exclude Editor: 0
Exclude Linux: 0
Exclude Linux64: 0
Exclude LinuxUniversal: 0
Exclude OSXIntel: 0
Exclude OSXIntel64: 0
Exclude OSXUniversal: 0
Exclude WebGL: 1
Exclude Win: 0
Exclude Win64: 1
- first:
Android: Android
second:
enabled: 0
settings:
CPU: x86
- first:
Any:
second:
enabled: 0
settings: {}
- first:
Editor: Editor
second:
enabled: 1
settings:
CPU: x86
DefaultValueInitialized: true
OS: Windows
- first:
Facebook: Win
second:
enabled: 1
settings:
CPU: AnyCPU
- first:
Facebook: Win64
second:
enabled: 0
settings:
CPU: None
- first:
Standalone: Linux
second:
enabled: 1
settings:
CPU: x86
- first:
Standalone: Linux64
second:
enabled: 1
settings:
CPU: x86_64
- first:
Standalone: LinuxUniversal
second:
enabled: 1
settings:
CPU: AnyCPU
- first:
Standalone: OSXIntel
second:
enabled: 1
settings:
CPU: AnyCPU
- first:
Standalone: OSXIntel64
second:
enabled: 1
settings:
CPU: AnyCPU
- first:
Standalone: OSXUniversal
second:
enabled: 1
settings:
CPU: AnyCPU
- first:
Standalone: Win
second:
enabled: 1
settings:
CPU: AnyCPU
- first:
Standalone: Win64
second:
enabled: 0
settings:
CPU: None
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,32 +0,0 @@
using DG.Tweening;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class Multimeter : MonoBehaviour
{
[Header("ÊÇ·ñ´øµç")]
public bool electricity = false;
[Header("µçÁ÷")]
public int activation;
private void OnMouseDown()
{
if (GameManager.ins.BlackWanYon!=null)
{
GameManager.ins.BlackWanYon.transform.parent = transform;
GameManager.ins.BlackWanYon.transform.DOLocalRotate(new Vector3(56, 0, 0), 0.25f);
GameManager.ins.BlackWanYon.transform.DOScale(new Vector3(200,200,200), 0.25f);
GameManager.ins.BlackWanYon.transform.DOLocalMove(new Vector3(0,0,-2), 0.25f);
GameManager.ins.BlackWanYon.layer = 0;
}
if (GameManager.ins.RedWanYon != null)
{
GameManager.ins.RedWanYon.transform.parent = transform;
GameManager.ins.RedWanYon.transform.DOLocalRotate(new Vector3(56, 0, 0), 0.25f);
GameManager.ins.RedWanYon.transform.DOScale(new Vector3(200,200,200), 0.25f);
GameManager.ins.RedWanYon.transform.DOLocalMove(new Vector3(0,0, -2f), 0.25f);
GameManager.ins.RedWanYon.layer = 0;
}
Debug.Log("³É¹¦");
}
}

View File

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: a43fdde5b2278bc4ea8228a3eae8c8ec
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,50 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.EventSystems;
public class MultimeterManager : MonoBehaviour
{
[SerializeField] Transform blackXian;
[SerializeField] Transform RedXian;
private Multimeter multimeter;
[SerializeField] Camera Camera;
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
// 鼠标左键按下
if (Input.GetMouseButtonDown(0))
{
// 从相机位置发射一条射线经过屏幕上的鼠标点击位置
Ray ray = Camera.ScreenPointToRay(Input.mousePosition);
// 声明一个射线碰撞信息类
RaycastHit hit;
// 进行碰撞检测
bool res = Physics.Raycast(ray, out hit,1 << 7) && !EventSystem.current.IsPointerOverGameObject();
if (res)
{
// 如果产生了碰撞
if (hit.collider.name.Equals("RedWanYon"))
{
GameManager.ins.BlackWanYon = null;
GameManager.ins.RedWanYon = RedXian.gameObject;
}
if (hit.collider.name.Equals("BlackWanYon"))
{
GameManager.ins.RedWanYon = null;
GameManager.ins.BlackWanYon = blackXian.gameObject;
}
Debug.Log(hit.collider.name);
}
}
}
}

View File

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: f71134dce17234846ae4a8705e1dc374
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,33 +0,0 @@
using DG.Tweening;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
public class MultimeterRecovery : MonoBehaviour
{
Button btn;
[SerializeField] Transform RedTrans;
[SerializeField] Transform BlackTrans;
[SerializeField] Transform trans;
[SerializeField] Vector3 Redpos;
[SerializeField] Vector3 Blackpos;
// Start is called before the first frame update
void Start()
{
btn = GetComponent<Button>();
btn.onClick.AddListener(() =>
{
RedTrans.parent = trans;
BlackTrans.parent = trans;
BlackTrans.transform.DOLocalRotate(new Vector3(0, 0, 0), 0.25f);
BlackTrans.transform.DOScale(new Vector3(1,1,1), 0.25f);
BlackTrans.transform.DOLocalMove(Blackpos, 0.25f);
BlackTrans.gameObject.layer = 7;
RedTrans.transform.DOLocalRotate(new Vector3(0, 0, 0), 0.25f);
RedTrans.transform.DOScale(new Vector3(1,1,1), 0.25f);
RedTrans.transform.DOLocalMove(Redpos, 0.25f);
RedTrans.gameObject.layer = 7;
});
}
}

View File

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: c5742db2d9f927b41a29f6646e76863b
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -27,8 +27,6 @@ public class GameManager : MonoBehaviour
[SerializeField] StopValve QianStopValve;
public GameObject temp;
[SerializeField] List<GameObject> interactive;
public GameObject RedWanYon;
public GameObject BlackWanYon;
public Interactive interactiveEnum = Interactive.none;
public void Awake()
{
@ -52,7 +50,6 @@ public class GameManager : MonoBehaviour
//{
// //Inverter[i].gameObject.SetActive(true);
//}
//System.Diagnostics.Process.Start(Application.streamingAssetsPath+ "/ycxt2.0/index.html");
UIManager.Instance.ToolsItemManager.ItemClick.AddListener(ToolsShow);
}
async Task initAsync()
@ -68,6 +65,18 @@ public class GameManager : MonoBehaviour
}
private void Update()
{
if (Input.GetKeyDown(KeyCode.Q))
{
ToolsShow(QianXing);
}
//if(Input.GetKeyDown(KeyCode.W))
//{
// ToolsShow(WanYon);
//}
if (Input.GetKeyDown(KeyCode.E))
{
ToolsShow(YanDianBi);
}
switch (interactiveEnum)
{
case Interactive.none:
@ -102,6 +111,7 @@ public class GameManager : MonoBehaviour
Destroy(temp.gameObject);
}
temp = Instantiate(tools, Player.transform);
UIManager.Instance.ToolsItemManager.currentTool = temp;
string name = Filter(temp.name, TempChar);

View File

@ -171,7 +171,7 @@ PlayerSettings:
Standalone: 0
iPhone: 0
tvOS: 0
overrideDefaultApplicationIdentifier: 1
overrideDefaultApplicationIdentifier: 0
AndroidBundleVersionCode: 1
AndroidMinSdkVersion: 22
AndroidTargetSdkVersion: 0

View File

@ -7,8 +7,6 @@ TagManager:
- door
- dianliu
- YanDian
- WanYon
- RedWanYon
layers:
- Default
- TransparentFX
@ -17,7 +15,7 @@ TagManager:
- Water
- UI
- QianXing
- Player
-
-
-
-