liuzhiwei
2020-12-08 ed4fb637a9a0477750d284bf0a42569ed0c0c26a
Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
4 files modified
25 ■■■■ changed files
Assets/Prefabs/UI/PlacementTileMobile.prefab 6 ●●●● patch | view | raw | blame | history
Assets/Scripts/Core/Camera/ViewPortAdj.cs 13 ●●●●● patch | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs 1 ●●●● patch | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/HUD/EndlessRandomTower.cs 5 ●●●● patch | view | raw | blame | history
Assets/Prefabs/UI/PlacementTileMobile.prefab
@@ -59,7 +59,7 @@
  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}
@@ -639,9 +639,9 @@
    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}
Assets/Scripts/Core/Camera/ViewPortAdj.cs
@@ -11,7 +11,10 @@
    /// </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;
@@ -21,8 +24,13 @@
        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;
        });
    }
@@ -47,6 +55,9 @@
        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
Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
@@ -636,6 +636,7 @@
            if (!isUpgradeTowerLevel && startTime >= JsonDataCenter.DOUBLE_GEM_TIME)
            {
                EndlessGameUI.instance.UpgradeAllTowerMinLevel(1);
                EndlessRandomTower.instance.UpdateDescDisplay();
                isUpgradeTowerLevel = true;
            }
Assets/Scripts/TowerDefense/UI/HUD/EndlessRandomTower.cs
@@ -82,7 +82,10 @@
    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}级宝石";
    }