From 9f44ddc93b96fe98ff71d8a24408871ae36befbd Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 22 八月 2018 11:21:55 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Dogz/DogzActiveWin.cs | 6 +++---
System/Dogz/DogzPackWin.cs | 4 ++--
System/Dogz/DogzItemCell.cs | 8 +++++---
System/Dogz/DogzModel.cs | 2 +-
4 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/System/Dogz/DogzActiveWin.cs b/System/Dogz/DogzActiveWin.cs
index 00d3410..c3ede02 100644
--- a/System/Dogz/DogzActiveWin.cs
+++ b/System/Dogz/DogzActiveWin.cs
@@ -215,18 +215,18 @@
private void UpdateDogzAssistCnt()
{
m_Controller.m_Scorller.RefreshActiveCellViews();
- m_DogzAssistCnt.text = StringUtility.Contact(model.GetAssistDogzCount(), "/", model.DogzAssistDefaultCnt);
+ m_DogzAssistCnt.text = Language.Get("TreasurePrivilege_Dogz_1", StringUtility.Contact(model.GetAssistDogzCount(), "/", model.DogzAssistDefaultCnt));
UpdateDogzBtn();
}
private void UpdateDogzBtn()
{
- m_CallBackBtnTxt.text = model.TryGetAssistDogzState(model.presentSelectDogz) ? "鍙洖" : "鍔╂垬";
+ m_CallBackBtnTxt.text = model.TryGetAssistDogzState(model.presentSelectDogz) ? Language.Get("DogzFunc104") : Language.Get("DogzFunc105");
}
private void AddAssist()
{
var _itemConfig = Config.Instance.Get<ItemConfig>(model.AddAssistItem);
- ConfirmCancel.ShowItemConfirm(string.Format("娑堣�梴0}X{1}姘镐箙澧炲姞1涓姪鎴樼鍏�", _itemConfig.ItemName, model.GetAssistItemCnt()),
+ ConfirmCancel.ShowItemConfirm(Language.Get("DogzFunc102", _itemConfig.ItemName, model.GetAssistItemCnt()),
model.AddAssistItem, model.GetAssistItemCnt(), () =>
{
model.SendBuyAssistCnt();
diff --git a/System/Dogz/DogzItemCell.cs b/System/Dogz/DogzItemCell.cs
index d72793b..4b3e648 100644
--- a/System/Dogz/DogzItemCell.cs
+++ b/System/Dogz/DogzItemCell.cs
@@ -15,17 +15,19 @@
{
dogzModel.GetDogzItemList();
ItemModel model = null;
- if(index < dogzModel.dogzItemList.Count)
+ DebugEx.Log("Display:" + index + "鏁版嵁闀垮害锛�" + dogzModel.dogzItemList.Count);
+ if (index < dogzModel.dogzItemList.Count)
{
model = dogzModel.dogzItemList[index];
}
- if(model == null)
+
+ if (model == null)
{
itemBaisc.gameObject.SetActive(false);
strengthLvTxt.gameObject.SetActive(false);
return;
}
-
+ DebugEx.Log("model:"+ model.itemId);
int strenLv = 0;
if (model.GetUseDataModel((int)ItemUseDataKey.Def_IudetDogzEquipPlus) != null)
{
diff --git a/System/Dogz/DogzModel.cs b/System/Dogz/DogzModel.cs
index 30dd0e2..03f761a 100644
--- a/System/Dogz/DogzModel.cs
+++ b/System/Dogz/DogzModel.cs
@@ -388,7 +388,7 @@
{
if (TryGetAssistDogzState(presentSelectDogz))
{
- ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"),"褰撳墠绁炲吔鍔╂垬涓紝鍗镐笅瑁呭鏃犳硶淇濇寔鍔╂垬鐘舵�侊紝纭畾缁х画锛�",
+ ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"),Language.Get("DogzFunc103"),
(bool isOk)=>
{
if(isOk)
diff --git a/System/Dogz/DogzPackWin.cs b/System/Dogz/DogzPackWin.cs
index 7c645cf..b9db389 100644
--- a/System/Dogz/DogzPackWin.cs
+++ b/System/Dogz/DogzPackWin.cs
@@ -133,7 +133,7 @@
}
else
{
- ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"),"鑳屽寘涓病鏈夎閮ㄤ綅鍙┛鎴寸殑瑁呭",(bool isOk)=>
+ ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("DogzFunc101"), (bool isOk)=>
{
if(isOk)
{
@@ -151,7 +151,7 @@
private void RefreshDogzItemEvent(PackType type, int index, int id)
{
- if (type != PackType.rptDogzItem || !dogzModel.IsReachSelectCondi(id)) return;
+ if (type != PackType.rptDogzItem && type != PackType.rptDogzEquip) return;
m_PackController.m_Scorller.RefreshActiveCellViews();
}
--
Gitblit v1.8.0