fix:1、修复bug 2、删除不用的代码和资源,sdk等

This commit is contained in:
2026-05-07 14:56:44 +08:00
parent 99145facbd
commit 28d582c373
378 changed files with 79341 additions and 86716 deletions
@@ -1,26 +1,45 @@
using System.Collections.Generic;
using System.Linq;
using SGModule.ConfigLoader;
namespace BallKingdomCrush
{
[ConfigKey("LevelUnlock")]
public class LevelUnlock
{
public int LeveType;
public string Name;
public int GoldCoins;
public int PassCoins;
}
[ConfigKey("Live")]
public class Live
{
public int Progress;
public int SubscribeUnlock; // 是否需要订阅解锁(0:不需要,1:需要)
public string Name;
public int GoldCoins;
public int AD;
public int CD;
}
using System.Collections.Generic;
using System.Linq;
using SGModule.ConfigLoader;
namespace BallKingdomCrush
{
[ConfigKey("LevelUnlock")]
public class LevelUnlock
{
public int LeveType;
public string Name;
public int GoldCoins;
public int PassCoins;
}
[ConfigKey("LevelUnlock_A")]
public class LevelUnlock_A
{
public int LeveType;
public string Name;
public int GoldCoins;
public int PassCoins;
}
[ConfigKey("Live")]
public class Live
{
public int Progress;
public int SubscribeUnlock; // 是否需要订阅解锁(0:不需要,1:需要)
public string Name;
public int GoldCoins;
public int AD;
public int CD;
}
[ConfigKey("Live_A")]
public class Live_A
{
public int Progress;
public int SubscribeUnlock; // 是否需要订阅解锁(0:不需要,1:需要)
public string Name;
public int GoldCoins;
public int AD;
public int CD;
}
}
@@ -1,40 +1,72 @@
using System.Collections.Generic;
using SGModule.ConfigLoader;
namespace BallKingdomCrush
{
[ConfigKey("FreeImageLibrary")]
public class FreeImageLibrary
{
public int id;
public string Name;
public int State;
}
[ConfigKey("ADImageLibrary")]
public class ADImageLibrary
{
public int id;
public string Name;
public int State;
public int GoldCoins;
}
[ConfigKey("SpecialImageLibrary")]
public class SpecialImageLibrary
{
public int id;
public string Name;
public int State;
public int GoldCoins;
}
[ConfigKey("VIPImageLibrary")]
public class VIPImageLibrary
{
public int id;
public string Name;
public int State;
public int GoldCoins;
}
using System.Collections.Generic;
using SGModule.ConfigLoader;
namespace BallKingdomCrush
{
[ConfigKey("FreeImageLibrary")]
public class FreeImageLibrary
{
public int id;
public string Name;
public int State;
}
[ConfigKey("ADImageLibrary")]
public class ADImageLibrary
{
public int id;
public string Name;
public int State;
public int GoldCoins;
}
[ConfigKey("SpecialImageLibrary")]
public class SpecialImageLibrary
{
public int id;
public string Name;
public int State;
public int GoldCoins;
}
[ConfigKey("VIPImageLibrary")]
public class VIPImageLibrary
{
public int id;
public string Name;
public int State;
public int GoldCoins;
}
[ConfigKey("FreeImageLibrary_A")]
public class FreeImageLibrary_A
{
public int id;
public string Name;
public int State;
}
[ConfigKey("ADImageLibrary_A")]
public class ADImageLibrary_A
{
public int id;
public string Name;
public int State;
public int GoldCoins;
}
[ConfigKey("SpecialImageLibrary_A")]
public class SpecialImageLibrary_A
{
public int id;
public string Name;
public int State;
public int GoldCoins;
}
[ConfigKey("VIPImageLibrary_A")]
public class VIPImageLibrary_A
{
public int id;
public string Name;
public int State;
public int GoldCoins;
}
}
@@ -1,23 +1,41 @@
using System.Collections.Generic;
using SGModule.ConfigLoader;
namespace BallKingdomCrush
{
[ConfigKey("SecretAlbums")]
public class SecretAlbums
{
public int id;
public int HotType;
public string Name;
public string Name2;
public float Price;
public int SubscribeUnlock; // 是否需要订阅解锁(0:不需要,1:需要)
public int PayType; //解锁方式(0:支付,1:金币,2:广告)
public float DiscountPrice;
public int GoldCoins;
public int AD;
public int CD;
public float Quantity;
public int[] State;
}
using System.Collections.Generic;
using SGModule.ConfigLoader;
namespace BallKingdomCrush
{
[ConfigKey("SecretAlbums")]
public class SecretAlbums
{
public int id;
public int HotType;
public string Name;
public string Name2;
public float Price;
public int SubscribeUnlock; // 是否需要订阅解锁(0:不需要,1:需要)
public int PayType; //解锁方式(0:支付,1:金币,2:广告)
public float DiscountPrice;
public int GoldCoins;
public int AD;
public int CD;
public float Quantity;
public int[] State;
}
[ConfigKey("SecretAlbums_A")]
public class SecretAlbums_A
{
public int id;
public int HotType;
public string Name;
public string Name2;
public float Price;
public int SubscribeUnlock; // 是否需要订阅解锁(0:不需要,1:需要)
public int PayType; //解锁方式(0:支付,1:金币,2:广告)
public float DiscountPrice;
public int GoldCoins;
public int AD;
public int CD;
public float Quantity;
public int[] State;
}
}
@@ -1,14 +1,14 @@
using System.Collections.Generic;
using SGModule.ConfigLoader;
namespace BallKingdomCrush
{
[ConfigKey("VipClub")]
public class VipClub
{
public int id;
public int VipType;
public float DiscountPrice;
public float Price;
}
}
using System.Collections.Generic;
using SGModule.ConfigLoader;
namespace BallKingdomCrush
{
[ConfigKey("VipClub")]
public class VipClub
{
public int id;
public int VipType;
public float DiscountPrice;
public float Price;
}
}
+205 -202
View File
@@ -1,203 +1,206 @@
using SGModule.Common;
using SGModule.Net;
using SGModule.NetKit;
using UNSDK;
namespace BallKingdomCrush
{
using System;
using UnityEngine;
using System.Collections.Generic;
using Unity.VisualScripting;
using IgnoreOPS;
using System.Linq;
public class HallManager : BaseUnityManager<HallManager>
{
public event Action UpdateSecondEvent;
public event Action UpdateFiveSecondEvent;
private float _secondTime;
private float _secondTime1;
private LoginModel loginModel;
private bool isGameStart;
private GameDataSystem gameDataSys;
private WindowSystem windowSys;
private RewardSystem rewardSys;
private ConsumeSystem consumeSys;
private bool isFirstEnter = true;
public int enterHallTimes = 0;
public event Action UpdateEvent;
// public int countTimes = 0;
public override void Init()
{
CtrlDispatcher.Instance.AddListener(CtrlMsg.Game_Start, OnGameStart);
GameDispatcher.Instance.AddListener(GameMsg.OpenGame, EnterGame);
GameDispatcher.Instance.AddListener(GameMsg.BackMainScene, (a) =>
{
EnterHall();
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.MainUI_Open);
});
AppDispatcher.Instance.AddListener(MainThreadMsg.App_Focus_True, BackToGame);
CtrlDispatcher.Instance.AddListener(CtrlMsg.open_wb, openWB);
InitSystem();
}
private void InitSystem()
{
gameDataSys = new GameDataSystem();
windowSys = new WindowSystem();
rewardSys = new RewardSystem();
consumeSys = new ConsumeSystem();
}
void BackToGame(object obj = null)
{
if (MaxPayManager.isPay)
{
MaxPayManager.isPay = false;
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PayloadingUI_Close);
MaxPayManager.Instance.PaySuccess();
}
}
private void OnGameStart(object obj)
{
// var lang = PlayerPrefsKit.ReadString("LangIdKey");
// if (lang.IsNullOrWhiteSpace())
// {
// lang = "en";
// }
// UIManager.Instance.SetSwitchLanguage(lang);
//初始化商品(谷歌支付和ios支付)
PurchasingManager.InitProduct();
isGameStart = true;
bool enterGame = CommonHelper.GetBoolByChance(ConfigSystem.GetCommonConf().roomrate / 100f);
EnterHall(true);
if (GameHelper.IsGiftSwitch() && enterGame)
{
EnterGame(enterGame);
}
TrackKit.TrackLoginFunnel(LoginFunnelEventType.EnterHall);
if (DataMgr.VipLevel.Value < 0 && DataMgr.VipExpirationTime.Value > 0)
{
PurchasingManager.CheckSubExpiration(true);
}
}
private void EnterHall(object obj = null)
{
// int index = obj != null ? (int)obj : 2;
enterHallTimes++;
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PlayUI_Close);
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.RewardAniUI_Close);
AudioManager.Instance.PlayBGM(AudioConst.MainBg);
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.MainTabUI_Open, index);
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.MainUI_Open);
GameHelper.PlayGameTimeEvent(1);
}
private void EnterGame(object obj)
{
if (GameHelper.GetLevel() < GameHelper.GetCommonModel().MultiModal)
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.MainTabUI_Close);
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.MainUI_Close);
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.RainPlayUI_Open);
AudioManager.Instance.PlayBGM(AudioConst.GameBg);
}
else
{
if (!DataMgr.LevelUnlockListNew.Value.Any(x => x.level_ == GameHelper.GetLevel()))
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.UnlockLevelNewUI_Open);
}
else
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.MainTabUI_Close);
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.MainUI_Close);
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.RainPlayUI_Open);
AudioManager.Instance.PlayBGM(AudioConst.GameBg);
}
}
}
private void openWB(object obj) {
SdkConfigMgr.Instance.Open();
CreatAnimalCard.instance.SetCameraVisible(false);
if (UIManager.Instance.IsExistUI(UIConst.RainPlayUI)) {
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.H5UI_Open, false);
} else {
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.H5UI_Open, true);
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.MainUI_Close);
}
GameDispatcher.Instance.Dispatch(GameMsg.hideBroadCast);
}
#region
public void GetGalleryNet(int imageID, Action<bool> action = null)
{
StartCoroutine(TextureHelper.GetGalleryFromNet(imageID, action));
}
#endregion
public void Update()
{
if (!isGameStart) return;
UpdateEvent?.Invoke();
_secondTime += Time.deltaTime;
_secondTime1 += Time.deltaTime;
if (_secondTime >= 1)
{
_secondTime = 0;
UpdateSecondEvent?.Invoke();
}
if (_secondTime1 >= 5)
{
_secondTime1 = 0;
UpdateFiveSecondEvent?.Invoke();
}
}
public void AddChangeGiftSwitch(Action action)
{
}
public void RemoveChangeGiftSwitch(Action action)
{
}
// void OnApplicationQuit()
// {
// PreferencesMgr.Instance.ImmediateSendSave();
// }
private bool isInH5;
public void SetInH5(bool isInH5)
{
this.isInH5 = isInH5;
}
}
using SGModule.Common;
using SGModule.Net;
using SGModule.NetKit;
using UNSDK;
namespace BallKingdomCrush
{
using System;
using UnityEngine;
using System.Collections.Generic;
using Unity.VisualScripting;
using IgnoreOPS;
using System.Linq;
public class HallManager : BaseUnityManager<HallManager>
{
public event Action UpdateSecondEvent;
public event Action UpdateFiveSecondEvent;
private float _secondTime;
private float _secondTime1;
private LoginModel loginModel;
private bool isGameStart;
private GameDataSystem gameDataSys;
private WindowSystem windowSys;
private RewardSystem rewardSys;
private ConsumeSystem consumeSys;
private bool isFirstEnter = true;
public int enterHallTimes = 0;
public event Action UpdateEvent;
// public int countTimes = 0;
public override void Init()
{
CtrlDispatcher.Instance.AddListener(CtrlMsg.Game_Start, OnGameStart);
GameDispatcher.Instance.AddListener(GameMsg.OpenGame, EnterGame);
GameDispatcher.Instance.AddListener(GameMsg.BackMainScene, (a) =>
{
EnterHall();
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.MainUI_Open);
});
AppDispatcher.Instance.AddListener(MainThreadMsg.App_Focus_True, BackToGame);
CtrlDispatcher.Instance.AddListener(CtrlMsg.open_wb, openWB);
InitSystem();
}
private void InitSystem()
{
gameDataSys = new GameDataSystem();
windowSys = new WindowSystem();
rewardSys = new RewardSystem();
consumeSys = new ConsumeSystem();
}
void BackToGame(object obj = null)
{
if (MaxPayManager.isPay)
{
MaxPayManager.isPay = false;
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PayloadingUI_Close);
MaxPayManager.Instance.PaySuccess();
}
}
private void OnGameStart(object obj)
{
// var lang = PlayerPrefsKit.ReadString("LangIdKey");
// if (lang.IsNullOrWhiteSpace())
// {
// lang = "en";
// }
// UIManager.Instance.SetSwitchLanguage(lang);
DataMgr.Coin.Value = 100000;
DataMgr.GameLevel.Value = 20;
//初始化商品(谷歌支付和ios支付)
PurchasingManager.InitProduct();
isGameStart = true;
bool enterGame = CommonHelper.GetBoolByChance(ConfigSystem.GetCommonConf().roomrate / 100f);
EnterHall(true);
if (GameHelper.IsGiftSwitch() && enterGame)
{
EnterGame(enterGame);
}
TrackKit.TrackLoginFunnel(LoginFunnelEventType.EnterHall);
if (DataMgr.VipLevel.Value < 0 && DataMgr.VipExpirationTime.Value > 0)
{
PurchasingManager.CheckSubExpiration(true);
}
}
private void EnterHall(object obj = null)
{
// int index = obj != null ? (int)obj : 2;
enterHallTimes++;
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PlayUI_Close);
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.RewardAniUI_Close);
AudioManager.Instance.PlayBGM(AudioConst.MainBg);
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.MainTabUI_Open, index);
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.MainUI_Open);
GameHelper.PlayGameTimeEvent(1);
}
private void EnterGame(object obj)
{
if (GameHelper.GetLevel() < GameHelper.GetCommonModel().MultiModal)
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.MainTabUI_Close);
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.MainUI_Close);
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.RainPlayUI_Open);
AudioManager.Instance.PlayBGM(AudioConst.GameBg);
}
else
{
if (!DataMgr.LevelUnlockListNew.Value.Any(x => x.level_ == GameHelper.GetLevel()))
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.UnlockLevelNewUI_Open);
}
else
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.MainTabUI_Close);
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.MainUI_Close);
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.RainPlayUI_Open);
AudioManager.Instance.PlayBGM(AudioConst.GameBg);
}
}
}
private void openWB(object obj) {
SdkConfigMgr.Instance.Open();
CreatAnimalCard.instance.SetCameraVisible(false);
if (UIManager.Instance.IsExistUI(UIConst.RainPlayUI)) {
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.H5UI_Open, false);
} else {
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.H5UI_Open, true);
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.MainUI_Close);
}
GameDispatcher.Instance.Dispatch(GameMsg.hideBroadCast);
}
#region
public void GetGalleryNet(int imageID, Action<bool> action = null)
{
StartCoroutine(TextureHelper.GetGalleryFromNet(imageID, action));
}
#endregion
public void Update()
{
if (!isGameStart) return;
UpdateEvent?.Invoke();
_secondTime += Time.deltaTime;
_secondTime1 += Time.deltaTime;
if (_secondTime >= 1)
{
_secondTime = 0;
UpdateSecondEvent?.Invoke();
}
if (_secondTime1 >= 5)
{
_secondTime1 = 0;
UpdateFiveSecondEvent?.Invoke();
}
}
public void AddChangeGiftSwitch(Action action)
{
}
public void RemoveChangeGiftSwitch(Action action)
{
}
// void OnApplicationQuit()
// {
// PreferencesMgr.Instance.ImmediateSendSave();
// }
private bool isInH5;
public void SetInH5(bool isInH5)
{
this.isInH5 = isInH5;
}
}
}
File diff suppressed because it is too large Load Diff