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

client_linchunjie

2019-01-11 bc7abe111d69d8a26b06be583ca4deb39bf08c67

 Fight/GameActor/GActorPlayerBase.cs

@@ -641,6 +641,10 @@
        }



        int _resID = JobSetup.BaseEquip[2];

        if(JobSetup.Job == 1)

        {

            _resID = JobSetup.BaseEquip[0] + 2900;

        }



        EquipInfo _equipInfo;