bug修改
This commit is contained in:
@@ -10,12 +10,13 @@ public class ChillConnectRoot : MonoBehaviour
|
||||
{
|
||||
public void Awake()
|
||||
{
|
||||
#if UNITY_EDITOR||GAME_RELEASE
|
||||
GameObject.Find("IngameDebugConsole").SetActive(false);
|
||||
#if UNITY_EDITOR || GAME_RELEASE
|
||||
GameObject ingameDebugConsole = GameObject.Find("IngameDebugConsole");
|
||||
if (ingameDebugConsole != null) ingameDebugConsole.SetActive(false);
|
||||
#endif
|
||||
// GameObject.Find("IngameDebugConsole").SetActive(false);//zhushi
|
||||
|
||||
// NetworkKit.Instance.InitData(ConfigManager.GameConfig.packageName, ConfigManager.GameConfig.isRelease);
|
||||
// NetworkKit.Instance.InitData(ConfigManager.GameConfig.packageName, ConfigManager.GameConfig.isRelease);
|
||||
|
||||
MaxADKit.Init();
|
||||
|
||||
|
||||
@@ -79,7 +79,7 @@ namespace ChillConnect
|
||||
AppDispatcher.Instance.AddListener(AppMsg.LoginInit, OnLoadingComplete);
|
||||
|
||||
// DataMgr.InitPreferences();
|
||||
NetworkDispatcher.Instance.Dispatch(NetworkMsg.GetConfig);
|
||||
// NetworkDispatcher.Instance.Dispatch(NetworkMsg.GetConfig);
|
||||
}
|
||||
private bool ispen = false;
|
||||
private void OnLoadingComplete(object param = null)
|
||||
|
||||
@@ -67,12 +67,8 @@ namespace ChillConnect
|
||||
|
||||
private void InitView()
|
||||
{
|
||||
Action closeCallback = null;
|
||||
|
||||
var sk = FXManager.Instance.SetFx<SkeletonAnimation>(ui.leaves_anim, Fx_Type.fx_login_leaves, ref closeCallback);
|
||||
sk.state.SetAnimation(0, "action", true);
|
||||
var sk1 = FXManager.Instance.SetFx<SkeletonAnimation>(ui.light_anim, Fx_Type.fx_login_light, ref closeCallback);
|
||||
sk1.state.SetAnimation(0, "animation", true);
|
||||
|
||||
|
||||
ui.btn_login.SetClick(OnClickBtn, true);
|
||||
|
||||
|
||||
@@ -293,7 +293,7 @@ namespace ChillConnect
|
||||
OnClickShop();
|
||||
});
|
||||
|
||||
ui.head_red.visible = PlayerPrefs.GetInt("player_head_red", 0) == 0;
|
||||
// ui.head_red.visible = PlayerPrefs.GetInt("player_head_red", 0) == 0;
|
||||
ui.btn_head.SetClick(() =>
|
||||
{
|
||||
// if (PlayerPrefs.GetInt("player_head_red", 0) == 0) PlayerPrefs.SetInt("player_head_red", 1);
|
||||
|
||||
@@ -61,8 +61,14 @@ namespace ChillConnect
|
||||
|
||||
protected override void OnOpenBefore(object args)
|
||||
{
|
||||
var sk = FXManager.Instance.SetFx<SkeletonAnimation>(baseUI.GetChild("bg_parent") as GGraph, Fx_Type.fx_login, ref closeCallback);
|
||||
sk.state.SetAnimation(0, "animation", false);
|
||||
// var sk = FXManager.Instance.SetFx<SkeletonAnimation>(baseUI.GetChild("bg_parent") as GGraph, Fx_Type.fx_login, ref closeCallback);
|
||||
// sk.state.SetAnimation(0, "animation", false);
|
||||
|
||||
|
||||
var sk = FXManager.Instance.SetFx<SkeletonAnimation>(ui.leaves_anim, Fx_Type.fx_login_bird, ref closeCallback);
|
||||
sk.state.SetAnimation(0, "animation", true);
|
||||
var sk1 = FXManager.Instance.SetFx<SkeletonAnimation>(ui.light_anim, Fx_Type.fx_login_light, ref closeCallback);
|
||||
sk1.state.SetAnimation(0, "liziguang1", true);
|
||||
}
|
||||
|
||||
protected override void OnOpen(object args)
|
||||
|
||||
@@ -48,7 +48,7 @@ namespace ChillConnect
|
||||
protected override void OnOpenBefore(object args)
|
||||
{
|
||||
if (args != null) need_show = (bool)args;
|
||||
string stage = GameHelper.gameType == 0 ? "Level " + GameHelper.GetLevel() : "";
|
||||
string stage = GameHelper.gameType == 0 ? "Lv." + GameHelper.GetLevel() : "";
|
||||
ui.text_level.text = stage;
|
||||
|
||||
InitView();
|
||||
@@ -90,23 +90,24 @@ namespace ChillConnect
|
||||
{
|
||||
|
||||
|
||||
var sk = FXManager.Instance.SetFx<SkeletonAnimation>(ui.anim, Fx_Type.fx_open, ref closeCallback);
|
||||
sk.state.SetAnimation(0, "animation", false);
|
||||
// var sk = FXManager.Instance.SetFx<SkeletonAnimation>(ui.anim, Fx_Type.fx_open, ref closeCallback);
|
||||
// sk.state.SetAnimation(0, "animation", false);
|
||||
|
||||
|
||||
DOVirtual.DelayedCall(2.8f, () =>
|
||||
{
|
||||
ui.bg.visible = false;
|
||||
});
|
||||
// DOVirtual.DelayedCall(2.8f, () =>
|
||||
// {
|
||||
// ui.bg.visible = false;
|
||||
// });
|
||||
ui.t0.Play();
|
||||
DOVirtual.DelayedCall(3.5f, () =>
|
||||
{
|
||||
ui.anim.visible = false;
|
||||
if (need_show) {
|
||||
// ui.anim.visible = false;
|
||||
if (need_show&&GameHelper.IsGiftSwitch()) {
|
||||
if (GameHelper.IsShowLevelTips())
|
||||
{
|
||||
ui.tips_node.visible = false;
|
||||
// ui.tips_node.visible = false;
|
||||
DOVirtual.DelayedCall(0.2f, ()=>{
|
||||
ui.tips_node.visible = true;
|
||||
// ui.tips_node.visible = true;
|
||||
var meteor1 = FXManager.Instance.SetFx<SkeletonAnimation>(ui.tips_node, Fx_Type.fx_tips, ref closeCallback);
|
||||
meteor1.state.SetAnimation(0, "animation", false);
|
||||
meteor1.state.Complete += a =>
|
||||
|
||||
@@ -126,7 +126,7 @@ namespace ChillConnect
|
||||
else
|
||||
{
|
||||
ui.btn_failpack.visible = false;
|
||||
// HallManager.Instance.UpdateEvent -= UpdateEvent;
|
||||
// HallManager.Instance.UpdateEvent -= UpdateEvent;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -156,10 +156,10 @@ namespace ChillConnect
|
||||
|
||||
if (Screen.safeArea.y != 0)
|
||||
{
|
||||
// ui.top_group.y += 68;
|
||||
ui.btn_gold.y += 68;
|
||||
|
||||
}
|
||||
ui.btn_add.y += 35;
|
||||
|
||||
|
||||
if (GameHelper.IsGiftSwitch())
|
||||
{
|
||||
@@ -282,7 +282,7 @@ namespace ChillConnect
|
||||
|
||||
void timeEvent()
|
||||
{
|
||||
if (SaveData.GetSaveObject().addview_off_time > GameHelper.GetNowTime())
|
||||
if (SaveData.GetSaveObject().addview_off_time > GameHelper.GetNowTime() && GameHelper.IsGiftSwitch())
|
||||
{
|
||||
if (!effect_show)
|
||||
ui.btn_add.type.selectedIndex = 1;
|
||||
@@ -572,20 +572,20 @@ namespace ChillConnect
|
||||
ui.btn_saveingpot.SetClick(() => { uiCtrlDispatcher.Dispatch(UICtrlMsg.SaveingPotUI_Open); });
|
||||
|
||||
|
||||
#if !UNITY_EDITOR
|
||||
string type = SystemInfo.deviceModel.ToLower().Trim();
|
||||
if (type.Substring(0, 3) != "iph")
|
||||
{
|
||||
ui.btn_add.x += -20;
|
||||
ui.btn_add.y += -34;
|
||||
}
|
||||
#endif
|
||||
// #if !UNITY_EDITOR
|
||||
// string type = SystemInfo.deviceModel.ToLower().Trim();
|
||||
// if (type.Substring(0, 3) != "iph")
|
||||
// {
|
||||
// ui.btn_add.x += -20;
|
||||
// ui.btn_add.y += -34;
|
||||
// }
|
||||
// #endif
|
||||
ui.btn_add.SetClick(() =>
|
||||
{
|
||||
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.AddViewoffUI_Open); return;//zhushi
|
||||
|
||||
// GameHelper.ShowTips("Coming Soon!");
|
||||
if (SaveData.GetSaveObject().addview_off_time > GameHelper.GetNowTime())
|
||||
if (SaveData.GetSaveObject().addview_off_time > GameHelper.GetNowTime() && GameHelper.IsGiftSwitch())
|
||||
{
|
||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.AddViewoffUI_Open);
|
||||
}
|
||||
@@ -654,7 +654,7 @@ namespace ChillConnect
|
||||
}
|
||||
|
||||
checkThreeGift();
|
||||
if (!SaveData.GetSaveObject().have_slot)
|
||||
if (!SaveData.GetSaveObject().have_slot && GameHelper.IsGiftSwitch())
|
||||
{
|
||||
ui.btn_add.t0.Play(() =>
|
||||
{
|
||||
@@ -1706,7 +1706,7 @@ namespace ChillConnect
|
||||
float complte_progress = showResurgence();
|
||||
if (GameHelper.GetLevelstate() != 0)
|
||||
{
|
||||
if (SaveData.GetSaveObject().game_fail_off_number >= ConfigSystem.GetConfig<CommonModel>().AddDiscountLevel && !is_showslot && !SaveData.GetSaveObject().have_slot)
|
||||
if (SaveData.GetSaveObject().game_fail_off_number >= ConfigSystem.GetConfig<CommonModel>().AddDiscountLevel && !is_showslot && !SaveData.GetSaveObject().have_slot && GameHelper.IsGiftSwitch())
|
||||
{
|
||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.AddViewoffUI_Open);
|
||||
SaveData.GetSaveObject().game_fail_off_number = 0;
|
||||
@@ -1722,7 +1722,7 @@ namespace ChillConnect
|
||||
if (SaveData.GetSaveObject().game_fail_number >= ConfigSystem.GetConfig<CommonModel>().AddSpaceLevel && !is_showslot && !SaveData.GetSaveObject().have_slot)
|
||||
{
|
||||
|
||||
if (SaveData.GetSaveObject().addview_off_time > GameHelper.GetNowTime())
|
||||
if (SaveData.GetSaveObject().addview_off_time > GameHelper.GetNowTime() && GameHelper.IsGiftSwitch())
|
||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.AddViewoffUI_Open);
|
||||
else
|
||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.BuyslotUI_Open);
|
||||
@@ -1752,7 +1752,7 @@ namespace ChillConnect
|
||||
}
|
||||
else
|
||||
{
|
||||
if (SaveData.GetSaveObject().game_fail_off_number >= ConfigSystem.GetConfig<CommonModel>().AddDiscountLevel && !is_showslot && !SaveData.GetSaveObject().have_slot)
|
||||
if (SaveData.GetSaveObject().game_fail_off_number >= ConfigSystem.GetConfig<CommonModel>().AddDiscountLevel && !is_showslot && !SaveData.GetSaveObject().have_slot && GameHelper.IsGiftSwitch())
|
||||
{
|
||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.AddViewoffUI_Open);
|
||||
SaveData.GetSaveObject().game_fail_off_number = 0;
|
||||
@@ -1767,7 +1767,7 @@ namespace ChillConnect
|
||||
if (SaveData.GetSaveObject().game_fail_number >= ConfigSystem.GetConfig<CommonModel>().AddSpaceLevel && !is_showslot && !SaveData.GetSaveObject().have_slot)
|
||||
{
|
||||
|
||||
if (SaveData.GetSaveObject().addview_off_time > GameHelper.GetNowTime())
|
||||
if (SaveData.GetSaveObject().addview_off_time > GameHelper.GetNowTime() && GameHelper.IsGiftSwitch())
|
||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.AddViewoffUI_Open);
|
||||
else
|
||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.BuyslotUI_Open);
|
||||
|
||||
Reference in New Issue
Block a user