Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
| | |
| | | canPlaceMat: {fileID: 2100000, guid: 434316934db1c90498f004f124d7c733, type: 2} |
| | | selectMat: {fileID: 2100000, guid: 3b7aa7626a2d4674ca2aa32958f14ca9, type: 2} |
| | | myOpenPS: {fileID: 5639653971360257455} |
| | | myPutPS: {fileID: 3764710002024050453} |
| | | myPutPS: {fileID: 5446732126781949981} |
| | | towerVSRenderer: {fileID: 2078962303223178405} |
| | | towerVSMat: {fileID: 2100000, guid: c40b753d26a2b4a4facef99e60c526d2, type: 2} |
| | | fire: {fileID: 2800000, guid: 8c9a3d26120e78f40aa4ef9ed23d573c, type: 3} |
| | |
| | | type: 3} |
| | | m_PrefabInstance: {fileID: 8416641207410710028} |
| | | m_PrefabAsset: {fileID: 0} |
| | | --- !u!198 &3764710002024050453 stripped |
| | | --- !u!198 &5446732126781949981 stripped |
| | | ParticleSystem: |
| | | m_CorrespondingSourceObject: {fileID: 4680090318796863769, guid: 19e5a86a7c5fc9e4ea8ff8768e0e368e, |
| | | m_CorrespondingSourceObject: {fileID: 4565318064113622545, guid: 19e5a86a7c5fc9e4ea8ff8768e0e368e, |
| | | type: 3} |
| | | m_PrefabInstance: {fileID: 8416641207410710028} |
| | | m_PrefabAsset: {fileID: 0} |
| | |
| | | /// </summary> |
| | | public UnityEngine.Camera cachedCamera { get; private set; } |
| | | |
| | | private Vector3 cachedCameraPos; |
| | | |
| | | public UnityEngine.Camera backGroundCamera { get; private set; } |
| | | private Vector3 backGroundCameraPos; |
| | | |
| | | public bool bAdjViewPort = false; |
| | | |
| | |
| | | cachedCamera.DOShakePosition(0.25f, 1.5f, 4).OnComplete(() => |
| | | { |
| | | KTGMGemClient.GameConfig.IsShaking = false; |
| | | cachedCamera.transform.position = cachedCameraPos; |
| | | |
| | | }); |
| | | backGroundCamera.DOShakePosition(0.25f, 1.5f, 4); |
| | | backGroundCamera.DOShakePosition(0.25f, 1.5f, 4).OnComplete(() => |
| | | { |
| | | backGroundCamera.transform.position = backGroundCameraPos; |
| | | }); |
| | | } |
| | | |
| | | |
| | |
| | | base.Awake(); |
| | | cachedCamera = GetComponent<UnityEngine.Camera>(); |
| | | backGroundCamera = GameObject.Find("BackCamera").GetComponent<UnityEngine.Camera>(); |
| | | |
| | | cachedCameraPos = cachedCamera.transform.position; |
| | | backGroundCameraPos = backGroundCamera.transform.position; |
| | | } |
| | | |
| | | // Start is called before the first frame update |
| | |
| | | if (!isUpgradeTowerLevel && startTime >= JsonDataCenter.DOUBLE_GEM_TIME) |
| | | { |
| | | EndlessGameUI.instance.UpgradeAllTowerMinLevel(1); |
| | | EndlessRandomTower.instance.UpdateDescDisplay(); |
| | | isUpgradeTowerLevel = true; |
| | | } |
| | | |
| | |
| | | |
| | | public void UpdateDescDisplay() |
| | | { |
| | | int minLevel = Mathf.Min(EndlessGameUI.instance.MinLevel, 1); |
| | | int minLevel = 0; |
| | | |
| | | if (EndlessUIStart.instance.GameStartTime >= JsonDataCenter.DOUBLE_GEM_TIME) |
| | | minLevel = Mathf.Min(EndlessGameUI.instance.MinLevel, 1); |
| | | |
| | | NormalDesc.text = $"购买{minLevel + 1}级宝石"; |
| | | } |