chenxin
2020-11-27 c49c0e39e4c11a438014a0b0732ecf0968fceb5e
出二级宝石的时间不对的bug
19 files modified
22 ■■■■■ changed files
And/GemBattle.apk patch | view | raw | blame | history
Assets/Materials/UI/tileTowerVSMat.mat 2 ●●● patch | view | raw | blame | history
Assets/Scripts/Json/JsonDataCenter.cs 7 ●●●●● patch | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/JsonDataInit.cs 2 ●●● patch | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/GM.cs 6 ●●●● patch | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/HUD/EndlessRandomTower.cs 5 ●●●● patch | view | raw | blame | history
GemBattle.zip patch | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/Assembly-CSharp-firstpass.dll patch | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/Assembly-CSharp.dll patch | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.Demos.dll patch | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.Haptics.dll patch | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.dll patch | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/Sirenix.OdinInspector.CompatibilityLayer.dll patch | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/Unity.TextMeshPro.dll patch | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/Unity.Timeline.dll patch | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/UnityEngine.UI.dll patch | view | raw | blame | history
GemBattle/宝石塔防_Data/globalgamemanagers patch | view | raw | blame | history
GemBattle/宝石塔防_Data/level1 patch | view | raw | blame | history
GemBattle/宝石塔防_Data/resources.assets patch | view | raw | blame | history
And/GemBattle.apk
Binary files differ
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: 93f40a01d57fbff418fc0b54b6ab7d9f, type: 3}
        m_Texture: {fileID: 2800000, guid: ea2ffef66c52dd14fbd46187be79f107, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MetallicGlossMap:
Assets/Scripts/Json/JsonDataCenter.cs
@@ -55,6 +55,8 @@
        // Svn版本信息.
        public static string SVNVERSION_INFO = "";
        public static float DOUBLE_GEM_TIME = 10f;
        /// <summary>
        /// 根据id和Level获取skillLevelInfo数据
        /// </summary>
@@ -188,10 +190,7 @@
                        break;
                    case "doublegem":
                        // 购买宝石直接获取2级宝石的时间
                        if (RandomTower.instanceExists)
                            RandomTower.LEVELUP_TOWER_TIME = tbat.value;
                        else if (EndlessRandomTower.instanceExists)
                            EndlessRandomTower.LEVELUP_TOWER_TIME = tbat.value;
                        DOUBLE_GEM_TIME = tbat.value;
                        break;
                    case "buildtime":
                        GRIDOPEN_CDTIME = tbat.value;
Assets/Scripts/TowerDefense/Level/JsonDataInit.cs
@@ -4,7 +4,7 @@
public class JsonDataInit : MonoBehaviour
{
    private void OnEnable()
    private void Awake()
    {
        JsonDataCenter.allData = new Dictionary<string, List<tabledata>>();
        JsonDataReader.Instance.StartRead(JsonDataCenter.ProcessInitDataLoad);
Assets/Scripts/TowerDefense/UI/GM.cs
@@ -58,7 +58,7 @@
            Tower aTower = EndlessRandomTower.instance.getTowerByName("CopyCatTower");
            int level = 0;
            if (EndlessUIStart.instance.GameStartTime >= EndlessRandomTower.LEVELUP_TOWER_TIME)
            if (EndlessUIStart.instance.GameStartTime >= JsonDataCenter.DOUBLE_GEM_TIME)
            {
                level = Mathf.Min(EndlessGameUI.instance.MinLevel, 1);
            }
@@ -74,7 +74,7 @@
            Tower aTower = EndlessRandomTower.instance.getTowerByName("GrowUpTower");
            int level = 0;
            if (EndlessUIStart.instance.GameStartTime >= EndlessRandomTower.LEVELUP_TOWER_TIME)
            if (EndlessUIStart.instance.GameStartTime >= JsonDataCenter.DOUBLE_GEM_TIME)
            {
                level = Mathf.Min(EndlessGameUI.instance.MinLevel, 1);
            }
@@ -90,7 +90,7 @@
            Tower aTower = EndlessRandomTower.instance.getTowerByName("BlinkTower");
            int level = 0;
            if (EndlessUIStart.instance.GameStartTime >= EndlessRandomTower.LEVELUP_TOWER_TIME)
            if (EndlessUIStart.instance.GameStartTime >= JsonDataCenter.DOUBLE_GEM_TIME)
            {
                level = Mathf.Min(EndlessGameUI.instance.MinLevel, 1);
            }
Assets/Scripts/TowerDefense/UI/HUD/EndlessRandomTower.cs
@@ -39,9 +39,6 @@
    // 开始出现技能塔的时间:
    public static float SKILL_TOWER_TIME = 30.0f;
    // 购买之后直接出现2级宝石的时间.
    public static float LEVELUP_TOWER_TIME = 10.0f;
    protected System.Random mRandom;
    protected int rTowerIdx = 2;
@@ -291,7 +288,7 @@
        if (gameUI.isBuilding)
            gameUI.CancelGhostPlacement();
        if (EndlessUIStart.instance.GameStartTime >= LEVELUP_TOWER_TIME)
        if (EndlessUIStart.instance.GameStartTime >= JsonDataCenter.DOUBLE_GEM_TIME)
        {
            if (level == -1)
                level = Mathf.Min(EndlessGameUI.instance.MinLevel, 1);
GemBattle.zip
Binary files differ
GemBattle/宝石塔防_Data/Managed/Assembly-CSharp-firstpass.dll
Binary files differ
GemBattle/宝石塔防_Data/Managed/Assembly-CSharp.dll
Binary files differ
GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.Demos.dll
Binary files differ
GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.Haptics.dll
Binary files differ
GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.dll
Binary files differ
GemBattle/宝石塔防_Data/Managed/Sirenix.OdinInspector.CompatibilityLayer.dll
Binary files differ
GemBattle/宝石塔防_Data/Managed/Unity.TextMeshPro.dll
Binary files differ
GemBattle/宝石塔防_Data/Managed/Unity.Timeline.dll
Binary files differ
GemBattle/宝石塔防_Data/Managed/UnityEngine.UI.dll
Binary files differ
GemBattle/宝石塔防_Data/globalgamemanagers
Binary files differ
GemBattle/宝石塔防_Data/level1
Binary files differ
GemBattle/宝石塔防_Data/resources.assets
Binary files differ