Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Wu Xijin

2018-09-21 c5165dad5c211b43a55d527f203354216e736814

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 Fight/GameActor/GActorNpcNoFight.cs

@@ -140,6 +140,11 @@
            Object.Destroy(m_Dig.gameObject);

            m_Dig = null;

        }



        if(Root)

        {

            Root.localScale = Vector3.one;

        }

    }



    public override void Destroy()


 System/Strengthening/GodBeastAttributes.cs

@@ -76,6 +76,7 @@
        {

            GodBeast_Number = 0;

            GodBeast_Part = 0;

            
            GodBeastReinforcementWin.ChooseToModify -= ChooseToModify;

            godBeastModel.AbsorbEvent -= AbsorbEvent;

        }

@@ -91,7 +92,11 @@


        private void OnClickToggle(bool Isbool)

        {

            if (GodBeastNumber != 0 && GodBeastPart != 0)

            {

            AttributeAssignment();

            }

          
        }

        private void OnClickStrengthBtn()

        {

@@ -163,6 +168,8 @@
            }

            else

            {

                GodBeastNumber = 0;

                GodBeastPart = 0;

                m_ItemCell.gameObject.SetActive(false);

                m_ExpSlider.stage = 0;

                m_ExpSlider.delay = 0f;


 UI/Common/UI3DModelFactory.cs

@@ -100,6 +100,11 @@
            animator.enabled = false;

        }



        if (model)

        {

            model.transform.localScale = Vector3.one;

        }



        var prefab = InstanceResourcesLoader.LoadNpcPrefab(id);

        if (prefab)

        {