屏蔽掉技能 购买塔位金币按钮改为 2.0缩放

chenxin

2020-11-19 6ecc5f28a31e8462b5a7be8cc5d8069412c0058b

屏蔽掉技能
购买塔位金币按钮改为 2.0缩放

 And/GemBattle.apk

Binary files differ

 Assets/00000/package/Prefab/Prefab/Effect_JiNengBaoShi_Dian_Hit.prefab

@@ -48,7 +48,7 @@
  ringBufferLoopRange: {x: 0, y: 1}
  looping: 1
  prewarm: 1
  playOnAwake: 1
  playOnAwake: 0
  useUnscaledTime: 0
  autoRandomSeed: 0
  useRigidbodyForVelocity: 1

 Assets/Materials/UI/tileTowerVSMat.mat

@@ -40,7 +40,7 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: 8c9a3d26120e78f40aa4ef9ed23d573c, type: 3}
        m_Texture: {fileID: 2800000, guid: 93f40a01d57fbff418fc0b54b6ab7d9f, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MetallicGlossMap:

 Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll.meta

@@ -1,18 +1,49 @@
fileFormatVersion: 2
guid: 5651992cdad94894a3af7dc3f1da9170
timeCreated: 1488812592
licenseType: Store
PluginImporter:
  serializedVersion: 1
  externalObjects: {}
  serializedVersion: 2
  iconMap: {}
  executionOrder: {}
  defineConstraints: []
  isPreloaded: 0
  isOverridable: 0
  isExplicitlyReferenced: 0
  validateReferences: 1
  platformData:
    Android:
  - first:
      : Linux
    second:
      enabled: 1
      settings: {}
  - first:
      : LinuxUniversal
    second:
      enabled: 1
      settings: {}
  - first:
      : OSXIntel
    second:
      enabled: 1
      settings: {}
  - first:
      : OSXIntel64
    second:
      enabled: 1
      settings: {}
  - first:
      : PSM
    second:
      enabled: 0
      settings: {}
  - first:
      Android: Android
    second:
      enabled: 0
      settings: {}
  - first:
    Any:
    second:
      enabled: 0
      settings:
        Exclude Android: 0
@@ -37,38 +68,39 @@
        Exclude XboxOne: 1
        Exclude iOS: 1
        Exclude tvOS: 1
    Editor:
  - first:
      Editor: Editor
    second:
      enabled: 0
      settings:
        DefaultValueInitialized: true
    Linux:
  - first:
      Standalone: Linux64
    second:
      enabled: 1
      settings: {}
    Linux64:
      settings:
        CPU: 
  - first:
      Standalone: OSXUniversal
    second:
      enabled: 1
      settings: {}
    LinuxUniversal:
      settings:
        CPU: 
  - first:
      Standalone: Win
    second:
      enabled: 1
      settings: {}
    OSXIntel:
      settings:
        CPU: 
  - first:
      Standalone: Win64
    second:
      enabled: 1
      settings: {}
    OSXIntel64:
      enabled: 1
      settings: {}
    OSXUniversal:
      enabled: 1
      settings: {}
    PSM:
      enabled: 0
      settings: {}
    Win:
      enabled: 1
      settings: {}
    Win64:
      enabled: 1
      settings: {}
    WindowsStoreApps:
      settings:
        CPU: 
  - first:
      Windows Store Apps: WindowsStoreApps
    second:
      enabled: 0
      settings:
        CPU: AnyCPU

 Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll.meta

@@ -1,18 +1,49 @@
fileFormatVersion: 2
guid: 5978f8f3dd274e848fbb7a123bde1fb9
timeCreated: 1488812592
licenseType: Store
PluginImporter:
  serializedVersion: 1
  externalObjects: {}
  serializedVersion: 2
  iconMap: {}
  executionOrder: {}
  defineConstraints: []
  isPreloaded: 0
  isOverridable: 0
  isExplicitlyReferenced: 0
  validateReferences: 1
  platformData:
    Android:
  - first:
      : Linux
    second:
      enabled: 1
      settings: {}
  - first:
      : LinuxUniversal
    second:
      enabled: 1
      settings: {}
  - first:
      : OSXIntel
    second:
      enabled: 1
      settings: {}
  - first:
      : OSXIntel64
    second:
      enabled: 1
      settings: {}
  - first:
      : PSM
    second:
      enabled: 0
      settings: {}
  - first:
      Android: Android
    second:
      enabled: 0
      settings: {}
  - first:
    Any:
    second:
      enabled: 0
      settings:
        Exclude Android: 0
@@ -37,38 +68,39 @@
        Exclude XboxOne: 1
        Exclude iOS: 1
        Exclude tvOS: 1
    Editor:
  - first:
      Editor: Editor
    second:
      enabled: 0
      settings:
        DefaultValueInitialized: true
    Linux:
  - first:
      Standalone: Linux64
    second:
      enabled: 1
      settings: {}
    Linux64:
      settings:
        CPU: 
  - first:
      Standalone: OSXUniversal
    second:
      enabled: 1
      settings: {}
    LinuxUniversal:
      settings:
        CPU: 
  - first:
      Standalone: Win
    second:
      enabled: 1
      settings: {}
    OSXIntel:
      settings:
        CPU: 
  - first:
      Standalone: Win64
    second:
      enabled: 1
      settings: {}
    OSXIntel64:
      enabled: 1
      settings: {}
    OSXUniversal:
      enabled: 1
      settings: {}
    PSM:
      enabled: 0
      settings: {}
    Win:
      enabled: 1
      settings: {}
    Win64:
      enabled: 1
      settings: {}
    WindowsStoreApps:
      settings:
        CPU: 
  - first:
      Windows Store Apps: WindowsStoreApps
    second:
      enabled: 0
      settings:
        CPU: AnyCPU

 Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll.meta

@@ -1,15 +1,54 @@
fileFormatVersion: 2
guid: d2a8f0021d6b47c5923d8972dfb81ef1
timeCreated: 1488812607
licenseType: Store
PluginImporter:
  serializedVersion: 1
  externalObjects: {}
  serializedVersion: 2
  iconMap: {}
  executionOrder: {}
  defineConstraints: []
  isPreloaded: 0
  isOverridable: 0
  isExplicitlyReferenced: 0
  validateReferences: 1
  platformData:
  - first:
      : N3DS
    second:
      enabled: 1
      settings: {}
  - first:
      : PSM
    second:
      enabled: 1
      settings: {}
  - first:
      : PSP2
    second:
      enabled: 1
      settings: {}
  - first:
      : SamsungTV
    second:
      enabled: 1
      settings: {}
  - first:
      : Tizen
    second:
      enabled: 1
      settings: {}
  - first:
      : WiiU
    second:
      enabled: 1
      settings: {}
  - first:
      Android: Android
    second:
      enabled: 1
      settings: {}
  - first:
    Any:
    second:
      enabled: 0
      settings:
        Exclude Android: 1
@@ -34,45 +73,41 @@
        Exclude XboxOne: 0
        Exclude iOS: 0
        Exclude tvOS: 0
    Editor:
  - first:
      Editor: Editor
    second:
      enabled: 0
      settings:
        DefaultValueInitialized: true
    N3DS:
  - first:
      PS4: PS4
    second:
      enabled: 1
      settings: {}
    PS4:
  - first:
      WebGL: WebGL
    second:
      enabled: 1
      settings: {}
    PSM:
      enabled: 1
      settings: {}
    PSP2:
      enabled: 1
      settings: {}
    SamsungTV:
      enabled: 1
      settings: {}
    Tizen:
      enabled: 1
      settings: {}
    WebGL:
      enabled: 1
      settings: {}
    WiiU:
      enabled: 1
      settings: {}
    WindowsStoreApps:
  - first:
      Windows Store Apps: WindowsStoreApps
    second:
      enabled: 1
      settings:
        CPU: AnyCPU
    XboxOne:
  - first:
      XboxOne: XboxOne
    second:
      enabled: 1
      settings: {}
    iOS:
  - first:
      iPhone: iOS
    second:
      enabled: 1
      settings: {}
    tvOS:
  - first:
      tvOS: tvOS
    second:
      enabled: 1
      settings: {}
  userData: 

 Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll.meta

@@ -1,15 +1,54 @@
fileFormatVersion: 2
guid: 1e0a9643dc0d4b46bf2321f72c4e503e
timeCreated: 1488812607
licenseType: Store
PluginImporter:
  serializedVersion: 1
  externalObjects: {}
  serializedVersion: 2
  iconMap: {}
  executionOrder: {}
  defineConstraints: []
  isPreloaded: 0
  isOverridable: 0
  isExplicitlyReferenced: 0
  validateReferences: 1
  platformData:
  - first:
      : N3DS
    second:
      enabled: 1
      settings: {}
  - first:
      : PSM
    second:
      enabled: 1
      settings: {}
  - first:
      : PSP2
    second:
      enabled: 1
      settings: {}
  - first:
      : SamsungTV
    second:
      enabled: 1
      settings: {}
  - first:
      : Tizen
    second:
      enabled: 1
      settings: {}
  - first:
      : WiiU
    second:
      enabled: 1
      settings: {}
  - first:
      Android: Android
    second:
      enabled: 1
      settings: {}
  - first:
    Any:
    second:
      enabled: 0
      settings:
        Exclude Android: 1
@@ -34,45 +73,41 @@
        Exclude XboxOne: 0
        Exclude iOS: 0
        Exclude tvOS: 0
    Editor:
  - first:
      Editor: Editor
    second:
      enabled: 0
      settings:
        DefaultValueInitialized: true
    N3DS:
  - first:
      PS4: PS4
    second:
      enabled: 1
      settings: {}
    PS4:
  - first:
      WebGL: WebGL
    second:
      enabled: 1
      settings: {}
    PSM:
      enabled: 1
      settings: {}
    PSP2:
      enabled: 1
      settings: {}
    SamsungTV:
      enabled: 1
      settings: {}
    Tizen:
      enabled: 1
      settings: {}
    WebGL:
      enabled: 1
      settings: {}
    WiiU:
      enabled: 1
      settings: {}
    WindowsStoreApps:
  - first:
      Windows Store Apps: WindowsStoreApps
    second:
      enabled: 1
      settings:
        CPU: AnyCPU
    XboxOne:
  - first:
      XboxOne: XboxOne
    second:
      enabled: 1
      settings: {}
    iOS:
  - first:
      iPhone: iOS
    second:
      enabled: 1
      settings: {}
    tvOS:
  - first:
      tvOS: tvOS
    second:
      enabled: 1
      settings: {}
  userData: 

 Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/ImportSettingsConfig.asset

New file
@@ -0,0 +1,15 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 0}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 188390376, guid: a4865f1ab4504ed8a368670db22f409c, type: 3}
  m_Name: ImportSettingsConfig
  m_EditorClassIdentifier: 
  automateBeforeBuild: 1

 Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/ImportSettingsConfig.asset.meta

New file
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: b8789d99b21698d44a4fa1213d4ca312
NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Assets/Plugins/Sirenix/Odin Inspector/Modules/Unity.Mathematics.meta

File was deleted

 Assets/Plugins/Sirenix/Odin Inspector/Modules/Unity.Mathematics/MathematicsDrawers.cs

File was deleted

 Assets/Plugins/Sirenix/Odin Inspector/Modules/Unity.Mathematics/MathematicsDrawers.cs.meta

File was deleted

 Assets/Plugins/Sirenix/Odin Inspector/Modules/Unity.Mathematics/Sirenix.OdinInspector.Modules.UnityMathematics.asmdef

File was deleted

 Assets/Plugins/Sirenix/Odin Inspector/Modules/Unity.Mathematics/Sirenix.OdinInspector.Modules.UnityMathematics.asmdef.meta

File was deleted

 Assets/Plugins/Sirenix/Odin Inspector/Modules/Unity.Mathematics/manifest.txt

File was deleted

 Assets/Plugins/Sirenix/Odin Inspector/Modules/Unity.Mathematics/manifest.txt.meta

File was deleted

 Assets/Prefabs/Enemies/water 1.prefab

@@ -755,6 +755,11 @@
  m_Modification:
    m_TransformParent: {fileID: 8434816861478773449}
    m_Modifications:
    - target: {fileID: 7677512363081710941, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
        type: 3}
      propertyPath: playOnAwake
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
        type: 3}
      propertyPath: m_LocalPosition.x

 Assets/Prefabs/UI/Endless/BottomCanvas.prefab

@@ -5782,9 +5782,9 @@
  m_Father: {fileID: 2459412157512953547}
  m_RootOrder: 5
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
  m_AnchoredPosition: {x: -418, y: -1003}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
  m_AnchoredPosition: {x: 122, y: 112}
  m_SizeDelta: {x: 300, y: 100}
  m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7859722467614881008

 Assets/Prefabs/UI/TileGridBuyBtn.prefab

@@ -29,7 +29,7 @@
  m_GameObject: {fileID: 1470395276146401760}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1.2, y: 1.2, z: 1.2}
  m_LocalScale: {x: 2, y: 2, z: 2}
  m_Children:
  - {fileID: 1470395277286368735}
  m_Father: {fileID: 0}

 Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs

@@ -170,13 +170,13 @@
            InitWaveData();
            RefreshBoss();

            if (!GameConfig.IsNewbie)
            {
                endless_boss bossData = EndlessBossData.GetDataById(waveData[0].Config.resource);
            // if (!GameConfig.IsNewbie)
            // {
            //     endless_boss bossData = EndlessBossData.GetDataById(waveData[0].Config.resource);

                if (bossData != null)
                    EndlessBossSkillManager.instance.Init(bossData.skill);
            }
            //     if (bossData != null)
            //         EndlessBossSkillManager.instance.Init(bossData.skill);
            // }
        }

        /// <summary>

 Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs

@@ -638,7 +638,7 @@
            // 血条位置的设定
            PreCalculateTowerBloodUi();

            float[] gapArr = { 0.2f, 0.7f };
            float[] gapArr = { 0.5f, 1f };
            m_arrTGO = new EndlessTowerGridOpen[dimensions.x, dimensions.y];

            GameObject container = GameObject.Find("BuyButtonContainer");
@@ -652,7 +652,7 @@
                    if (m_arrGridType[x, y] != PlacementGridType.EGridWaitBuy) continue;

                    GameObject buyButton = Instantiate(waitBuyBtnPrefab);
                    buyButton.transform.SetParent(container.transform);
                    buyButton.transform.SetParent(container.transform, false);

                    Vector3 pos = buyButton.transform.position;
                    //pos.x = arrGridCentPos[x, y].x + (x - 2) * gapArr[3 - y] + xup[x];
@@ -668,8 +668,6 @@
                    // }
                    pos.y = 30;
                    buyButton.transform.position = pos;
                    buyButton.transform.localRotation = Quaternion.identity;
                    buyButton.transform.localScale = Vector3.one;

                    // 设置按钮对应的点击功能
                    EndlessTowerGridOpen tgo = buyButton.GetComponent<EndlessTowerGridOpen>();
@@ -892,9 +890,10 @@

            for (int tx = 0; tx < dimensions.x; tx++)
            {
                m_arrGridType[tx, sy] = PlacementGridType.EGridOpen;
                m_arrGridType[tx, sy] = PlacementGridType.EGridWaitBuy;
                m_arrGridType[tx, sy - 1] = PlacementGridType.EGridWaitBuy;
            }
            m_arrGridType[2, 3] = PlacementGridType.EGridOpen;
            ++GameConfig.EndlessOpenAttackTowerCount;
        }