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

client_linchunjie

2018-09-20 7097bcee6a3c0f50cea43ff897e4cdb77d464240

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

 Core/NetworkPackage/ClientPack/ClientToMapServer/CA5_Function/CA5C4_tagCMDogzEquipPlus.cs

@@ -1,45 +1,25 @@
using UnityEngine;

using System.Collections;



// A5 C4 神兽装备强化 #tagCMDogzEquipPlus







public class CA5C4_tagCMDogzEquipPlus : GameNetPackBasic {



    public byte EquipIndex;    //神兽装备背包中索引



    public byte IndexCount;    //材料所在神兽物品背包索引的数量



    public  byte[] IndexList;    //材料所在神兽物品背包索引列表



    public byte IsDouble;    //是否双倍强化







    public CA5C4_tagCMDogzEquipPlus () {



        combineCmd = (ushort)0x03FE;



        _cmd = (ushort)0xA5C4;



    }







    public override void WriteToBytes () {



        WriteBytes (EquipIndex, NetDataType.BYTE);



        WriteBytes (IndexCount, NetDataType.BYTE);



        WriteBytes (IndexList, NetDataType.BYTE, IndexCount);



        WriteBytes (IsDouble, NetDataType.BYTE);



    }







}



// A5 C4 神兽装备强化 #tagCMDogzEquipPlus



public class CA5C4_tagCMDogzEquipPlus : GameNetPackBasic {

    public byte EquipIndex;    //神兽装备背包中索引

    public byte IndexCount;    //材料所在神兽物品背包索引的数量

    public  byte[] IndexList;    //材料所在神兽物品背包索引列表

    public  uint[] IndexUseCountList;    //材料所在神兽物品背包索引对应使用个数列表

    public byte IsDouble;    //是否双倍强化



    public CA5C4_tagCMDogzEquipPlus () {

        _cmd = (ushort)0xA5C4;

    }



    public override void WriteToBytes () {

        WriteBytes (EquipIndex, NetDataType.BYTE);

        WriteBytes (IndexCount, NetDataType.BYTE);

        WriteBytes (IndexList, NetDataType.BYTE, IndexCount);

        WriteBytes (IndexUseCountList, NetDataType.DWORD, IndexCount);

        WriteBytes (IsDouble, NetDataType.BYTE);

    }



}


 Hooks/commit-msg

@@ -1,9 +1,9 @@
#!/bin/sh
# -*- coding: UTF-8 -*- 

if [ "$(grep -in '^[0-9]*[1-9][0-9]* .*' "$1")" == "" ] && [ "$(grep -in '^Merge .*' "$1")" == "" ] && [ "$(grep -in '^Revert .*' "$1")" == "" ]; then
if [ "$(grep -in '^[0-9]\{4,5\} .*' "$1")" == "" ] && [ "$(grep -in '^Merge .*' "$1")" == "" ] && [ "$(grep -in '^Revert .*' "$1")" == "" ]; then
    echo 以下3种是正确的备注信息是：
    echo 1. 12345 正常提交备注信息必须以数字单号开头。#数字单号后面带空格#
    echo 1. 12345 正常提交备注信息必须以4到5位数字单号开头。#数字单号后面带空格#
    echo 2. Merge 以Merge开头说明这是一次git合并操作，这是被允许的。#Merge后面带空格#
    echo 3. Revert 以Revert开头说明这是一次git还原操作，这是被允许的。#Revert后面带空格#
    exit 1

 System/Dogz/DogzModel.cs

@@ -448,16 +448,22 @@
            GameNetSystem.Instance.SendInfo(buyCnt);

        }



        public void SendDogzEquipStrength(int index,List<int>indexlist,int isDouble)

        public void SendDogzEquipStrength(int index,List<int>indexlist,List<int> IndexUseCountList, int isDouble)

        {

            CA5C4_tagCMDogzEquipPlus dogzStren = new CA5C4_tagCMDogzEquipPlus();

            dogzStren.EquipIndex = (byte)index;

            dogzStren.IndexCount = (byte)indexlist.Count;

            byte[] indexByte = new byte[indexlist.Count];

            for(int i = 0; i < indexByte.Length; i++)

            uint[] indexUseCountList = new uint[indexlist.Count];

            for (int i = 0; i < indexByte.Length; i++)

            {

                indexByte[i] = (byte)indexlist[i];

            }

            for (int i = 0; i < indexUseCountList.Length; i++)

            {

                indexUseCountList[i] = (uint)IndexUseCountList[i];

            }

            dogzStren.IndexUseCountList = indexUseCountList;

            dogzStren.IndexList = indexByte;

            dogzStren.IsDouble = (byte)isDouble;

            GameNetSystem.Instance.SendInfo(dogzStren);


 System/Strengthening/GodBeastAttributes.cs

@@ -94,18 +94,20 @@
        private void OnClickStrengthBtn()

        {

            Dictionary<int, int> DicAb = godBeastModel.Absorption_Dic;

            List<int> List = new List<int>();

            List<int> ListIndex = new List<int>();

            List<int> ListCount = new List<int>();

            foreach (var key in DicAb.Keys)

            {

                List.Add(key);

                ListIndex.Add(key);

                ListCount.Add(DicAb[key]);

            }

            if (m_DoubleToggle.isOn)

            {                

                dogz_model.SendDogzEquipStrength(m_DogZItemModel.itemInfo.ItemPlace, List,1);

                dogz_model.SendDogzEquipStrength(m_DogZItemModel.itemInfo.ItemPlace, ListIndex, ListCount, 1);

            }

            else

            {

                dogz_model.SendDogzEquipStrength(m_DogZItemModel.itemInfo.ItemPlace, List, 0);

                dogz_model.SendDogzEquipStrength(m_DogZItemModel.itemInfo.ItemPlace, ListIndex, ListCount, 0);

            }

        }

        private void ChooseToModify(int locationMarker)


 System/Strengthening/GodBeastEntry.cs

@@ -44,11 +44,13 @@
                        m_Item_Text.color = UIHelper.GetUIColor(itemConfig.ItemColor);                     

                        if (IudetDogzEquipPlus != null && IudetDogzEquipPlus[0] > 0)

                        {

                            m_Item_Text.text = itemConfig.ItemName+"  +"+ IudetDogzEquipPlus[0];

                            string str= itemConfig.ItemName + "  +" + IudetDogzEquipPlus[0];

                            m_Item_Text.text = UIHelper.GetTextColorByItemColor(itemConfig.ItemColor, str, true);

                        }

                        else

                        {

                            m_Item_Text.text = itemConfig.ItemName;

                            string str = itemConfig.ItemName;

                            m_Item_Text.text = UIHelper.GetTextColorByItemColor(itemConfig.ItemColor, str, true);

                        }

                        if (locationMarker == currentlySelected)

                        {