From a76cedaf8e3a2ded5f2f2b237a85e564a4a489c6 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 22 五月 2019 14:30:04 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
/dev/null | 12 ------------
System/KnapSack/Logic/GuardOverdueWin.cs | 4 ----
2 files changed, 0 insertions(+), 16 deletions(-)
diff --git a/System/KnapSack/Logic/GuardOverdueWin.cs b/System/KnapSack/Logic/GuardOverdueWin.cs
index 3f359b5..19e9308 100644
--- a/System/KnapSack/Logic/GuardOverdueWin.cs
+++ b/System/KnapSack/Logic/GuardOverdueWin.cs
@@ -142,10 +142,6 @@
}
});
}
- else
- {
- WindowCenter.Instance.Open<BindGoldRechargeWin>();
- }
}
private void OnClickRenewal()
diff --git a/System/MainInterfacePanel/BindGoldRechargeWin.cs b/System/MainInterfacePanel/BindGoldRechargeWin.cs
deleted file mode 100644
index 07e963c..0000000
--- a/System/MainInterfacePanel/BindGoldRechargeWin.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
-// [ Date ]: Tuesday, October 10, 2017
-//--------------------------------------------------------
-//閽荤煶涓嶈冻鐨勫厖鍊煎紩瀵�
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UI;
-
-namespace Snxxz.UI {
-
- public class BindGoldRechargeWin : Window
- {
- public Button _CloseBtn;//鍏抽棴鎸夐挳
- public Button _Btn_Recharge;//鍏呭�兼寜閽�
- #region Built-in
- protected override void BindController()
- {
- }
-
- protected override void AddListeners()
- {
- _CloseBtn.onClick.AddListener(CloseClick);
- _Btn_Recharge.onClick.AddListener(CloseClick);
- }
-
- protected override void OnPreOpen()
- {
- }
-
- protected override void OnAfterOpen()
- {
- }
-
- protected override void OnPreClose()
- {
- }
-
- protected override void OnAfterClose()
- {
- }
-
- #endregion
-
- }
-
-}
-
-
-
-
diff --git a/System/MainInterfacePanel/BindGoldRechargeWin.cs.meta b/System/MainInterfacePanel/BindGoldRechargeWin.cs.meta
deleted file mode 100644
index 550506a..0000000
--- a/System/MainInterfacePanel/BindGoldRechargeWin.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: e12ce23abe132634d83e639c74d65d9e
-timeCreated: 1527606506
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/System/MainInterfacePanel/InformationTipsWin.cs b/System/MainInterfacePanel/InformationTipsWin.cs
deleted file mode 100644
index f906c39..0000000
--- a/System/MainInterfacePanel/InformationTipsWin.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
-// [ Date ]: Tuesday, October 10, 2017
-//--------------------------------------------------------
-//鍙屽�嶅鍔遍鍙栫殑鎻愮ず淇℃伅妗�
-using System;
-using System.Collections;
-using System.Collections.Generic;
-
-using UnityEngine;
-using UnityEngine.UI;
-
-namespace Snxxz.UI
-{
-
- public class InformationTipsWin : Window
- {
- public Button _CloseBtn;//鍏抽棴鎸夐挳
- public Button _Btn_Cancel;//鍙栨秷鎸夐挳
- public Button _Btn_Sure;//纭鎸夐挳
- public Toggle _Toggle_Tips;//toggle 鎸夐挳
- public Text _Text_Extend;//淇℃伅鏉�
-
- TaskModel taskmodel { get { return ModelCenter.Instance.GetModel<TaskModel>(); } }
-
- #region Built-in
- protected override void BindController()
- {
- }
-
- protected override void AddListeners()
- {
- _CloseBtn.onClick.AddListener(CloseButton);
- _Btn_Cancel.onClick.AddListener(CancelButton);
- _Btn_Sure.onClick.AddListener(SureButton);
- _Toggle_Tips.onValueChanged.AddListener((bool _bool) => { Toggle(); });
- }
-
- protected override void OnPreOpen()
- {
- DoubleToReceive();
- }
-
- protected override void OnAfterOpen()
- {
- }
-
- protected override void OnPreClose()
- {
- }
-
- protected override void OnAfterClose()
- {
- }
-
- void CloseButton()
- {
-
- Close();
-
- }
- void CancelButton()
- {
- Close();
-
- }
- void SureButton()
- {
- taskmodel.RequestGetTaskAward("Double");
- Close();
- SelectionManager.Release(SelectionManager.E_Type.Green);
- WindowCenter.Instance.Close<TaskBoxBGMWin>();
- WindowCenter.Instance.Open<MainInterfaceWin>();
-
- }
- void Toggle()
- {
-
- if (_Toggle_Tips.isOn)
- {
- TaskModel._globalbool = true;
- }
- else
- {
- TaskModel._globalbool = false;
- }
-
- }
-
-
- void DoubleToReceive()//鏄惁鑳藉棰嗗彇鍙屽�嶅鍔�
- {
-
- string _requireNumberStr = FuncConfigConfig.Get("TaskExpend").Numerical1;
- int _requireNumber = int.Parse(_requireNumberStr);
- _Text_Extend.text = string.Format(Language.Get("Z1070"), _requireNumberStr);
-
- return;
-
- }
- #endregion
-
- }
-
-}
-
-
-
-
diff --git a/System/MainInterfacePanel/InformationTipsWin.cs.meta b/System/MainInterfacePanel/InformationTipsWin.cs.meta
deleted file mode 100644
index 379ebf2..0000000
--- a/System/MainInterfacePanel/InformationTipsWin.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 7e7d1f4c1b8e4da48852c26145cca015
-timeCreated: 1507623392
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
--
Gitblit v1.8.0