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

client_linchunjie

2019-03-14 d0d289d502fe85e9bb597ced1b41c73b8bc75889

 System/Store/StoreModel.cs

@@ -18,13 +18,11 @@
{

    public int itemId;

    public int count;

    public int isBind;



    public ShopItemInfo(int id, int count, int isBind)

    public ShopItemInfo(int id, int count)

    {

        this.itemId = id;

        this.count = count;

        this.isBind = isBind;

    }

}



@@ -674,7 +672,7 @@
        {

            case 7:

                int willRefreshTime = GetWillRefreshTime();

                return Language.Get(resetTimeDict[type], UIHelper.AppendStringColor(TextColType.Green, TimeUtility.SecondsToHMS(willRefreshTime), true));

                return Language.Get(resetTimeDict[type], UIHelper.AppendColor(TextColType.Green, TimeUtility.SecondsToHMS(willRefreshTime), true));

            default:

                return Language.Get(resetTimeDict[type]);

        }

@@ -853,7 +851,7 @@
        if (storeConfig.ItemID != 0)

        {

            int replaceId = GetReplaceId(storeConfig.ID, storeConfig.ItemID);

            ShopItemInfo shopItem = new ShopItemInfo(replaceId, storeConfig.ItemCnt, storeConfig.IsBind);

            ShopItemInfo shopItem = new ShopItemInfo(replaceId, storeConfig.ItemCnt);

            shopItemlist.Add(shopItem);

        }

        JsonData extraItem = JsonMapper.ToObject(storeConfig.ItemListEx);

@@ -867,11 +865,10 @@
                    {

                        int itemId = int.Parse(extraItem[i][0].ToString());

                        int itemCount = int.Parse(extraItem[i][1].ToString());

                        int isBind = int.Parse(extraItem[i][2].ToString());

                        if (itemId != 0)

                        {

                            int extraReplaceId = GetReplaceId(storeConfig.ID, itemId);

                            ShopItemInfo shop = new ShopItemInfo(extraReplaceId, itemCount, isBind);

                            ShopItemInfo shop = new ShopItemInfo(extraReplaceId, itemCount);

                            shopItemlist.Add(shop);

                        }

                    }

@@ -931,7 +928,7 @@
    {

        BuyItemPopModel.Instance.SetModel(shopInfo.ID);

        int itemId = GetReplaceId(shopInfo.ID, shopInfo.ItemID);

        ItemAttrData attrData = new ItemAttrData(itemId, true, (ulong)shopInfo.ItemCnt, -1, shopInfo.IsBind, true, PackType.Deleted

        ItemAttrData attrData = new ItemAttrData(itemId, true, (ulong)shopInfo.ItemCnt, -1, true, PackType.Deleted

            , "", null, ItemTipChildType.Buy);

        itemTipsModel.SetItemTipsModel(attrData, false);

        attrData.SetTipsFuncBtn(ItemOperateType.buy, (ItemOperateType type, string id) => { OnClickBuyBtn(ItemOperateType.buy, shopInfo.ID); });

@@ -1037,7 +1034,7 @@
                {

                    return;

                }

                BuySuccessModel.Instance.SetBuySuccessModel(chinModel.ID, (int)result.ItemCnt, tagStore.IsBind);

                BuySuccessModel.Instance.SetBuySuccessModel(chinModel.ID, (int)result.ItemCnt);

                if (!WindowCenter.Instance.IsOpen<BuySuccessWin>())

                {

                    WindowCenter.Instance.Open<BuySuccessWin>();