fix:1、修复bug。2、删除json表,改为配置加载

This commit is contained in:
barry
2026-06-30 22:15:06 +08:00
parent 1354dfbc34
commit 776d63928d
1086 changed files with 49845 additions and 533285 deletions
@@ -0,0 +1,22 @@
using System.Collections.Generic;
using SGModule.ConfigLoader;
namespace IgnoreOPS
{
public class ArrowGameConfigModel : ConfigModel<ArrowGameConfigModel, ArrowGameConfig>
{
public ArrowGameConfigModel(string key) : base(key)
{
}
}
public class ArrowGameConfig
{
public int id;
public string levelName;
public int gridRows;
public int gridCols;
public int pointSpacing;
public string arrows;
}
}
@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: a2de481234414c8792feee2aa26c6e47
timeCreated: 1782804009
@@ -9,6 +9,7 @@ namespace FGUI.Arrow_game
{
public Controller can;
public GImage bg;
public GImage img_saveingpot;
public GTextField text;
public const string URL = "ui://sjl9teijrsd4g";
@@ -23,7 +24,8 @@ namespace FGUI.Arrow_game
can = GetControllerAt(0);
bg = (GImage)GetChildAt(0);
text = (GTextField)GetChildAt(1);
img_saveingpot = (GImage)GetChildAt(1);
text = (GTextField)GetChildAt(2);
}
}
}
@@ -10,6 +10,7 @@ namespace FGUI.Common_01
{
UIObjectFactory.SetPackageItemExtension(com_money.URL, typeof(com_money));
UIObjectFactory.SetPackageItemExtension(btn_task_pass.URL, typeof(btn_task_pass));
UIObjectFactory.SetPackageItemExtension(com_open_tips.URL, typeof(com_open_tips));
UIObjectFactory.SetPackageItemExtension(btn_watchAd.URL, typeof(btn_watchAd));
UIObjectFactory.SetPackageItemExtension(com_broadcast_text1.URL, typeof(com_broadcast_text1));
UIObjectFactory.SetPackageItemExtension(btn_noads.URL, typeof(btn_noads));
@@ -0,0 +1,29 @@
/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
using FairyGUI;
using FairyGUI.Utils;
namespace FGUI.Common_01
{
public partial class com_open_tips : GComponent
{
public GTextField text_level_limit;
public GGroup panel;
public Transition t0;
public const string URL = "ui://o9974uc5arocdc";
public static com_open_tips CreateInstance()
{
return (com_open_tips)UIPackage.CreateObject("Common_01", "com_open_tips");
}
public override void ConstructFromXML(XML xml)
{
base.ConstructFromXML(xml);
text_level_limit = (GTextField)GetChildAt(2);
panel = (GGroup)GetChildAt(3);
t0 = GetTransitionAt(0);
}
}
}
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 39f9cfc14b5aa4b2e9e3d36817f63e57
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
@@ -21,9 +21,9 @@ namespace FGUI.Common_01
{
base.ConstructFromXML(xml);
title = (GTextField)GetChildAt(1);
btn_relog = (btn_yellow)GetChildAt(2);
content = (GTextField)GetChildAt(3);
title = (GTextField)GetChildAt(2);
btn_relog = (btn_yellow)GetChildAt(3);
content = (GTextField)GetChildAt(4);
}
}
}
@@ -9,7 +9,6 @@ namespace FGUI.Lobby_03
{
public Controller state;
public GTextField text_name;
public GButton bnt_luck_gift;
public GButton btn_petty;
public GButton btn_battle;
public GButton btn_noads;
@@ -46,32 +45,31 @@ namespace FGUI.Lobby_03
base.ConstructFromXML(xml);
state = GetControllerAt(0);
text_name = (GTextField)GetChildAt(2);
bnt_luck_gift = (GButton)GetChildAt(3);
btn_petty = (GButton)GetChildAt(5);
btn_battle = (GButton)GetChildAt(6);
btn_noads = (GButton)GetChildAt(7);
btn_task = (GButton)GetChildAt(8);
btn_statement = (GButton)GetChildAt(9);
btn_wv = (GButton)GetChildAt(10);
left_group = (GGroup)GetChildAt(11);
btn_failpack = (GButton)GetChildAt(13);
btn_faq = (GButton)GetChildAt(14);
btn_three_day = (GButton)GetChildAt(15);
btn_shop = (btn_shop)GetChildAt(19);
btn_saveingpot = (GButton)GetChildAt(20);
btn_rank = (GButton)GetChildAt(21);
btn_sign = (btn_sign)GetChildAt(22);
btn_spin = (btn_wheel)GetChildAt(23);
btn_setting = (GButton)GetChildAt(24);
btn_restore = (GButton)GetChildAt(25);
right_group = (GGroup)GetChildAt(26);
btn_money = (GComponent)GetChildAt(27);
btn_start = (GButton)GetChildAt(29);
com_level = (com_level)GetChildAt(30);
btn_gold = (GButton)GetChildAt(32);
btn_head = (GButton)GetChildAt(33);
top_group = (GGroup)GetChildAt(34);
text_name = (GTextField)GetChildAt(1);
btn_petty = (GButton)GetChildAt(3);
btn_battle = (GButton)GetChildAt(4);
btn_noads = (GButton)GetChildAt(5);
btn_task = (GButton)GetChildAt(6);
btn_statement = (GButton)GetChildAt(7);
btn_wv = (GButton)GetChildAt(8);
left_group = (GGroup)GetChildAt(9);
btn_failpack = (GButton)GetChildAt(11);
btn_faq = (GButton)GetChildAt(12);
btn_three_day = (GButton)GetChildAt(13);
btn_shop = (btn_shop)GetChildAt(17);
btn_saveingpot = (GButton)GetChildAt(18);
btn_rank = (GButton)GetChildAt(19);
btn_sign = (btn_sign)GetChildAt(20);
btn_spin = (btn_wheel)GetChildAt(21);
btn_setting = (GButton)GetChildAt(22);
btn_restore = (GButton)GetChildAt(23);
right_group = (GGroup)GetChildAt(24);
btn_money = (GComponent)GetChildAt(25);
btn_start = (GButton)GetChildAt(27);
com_level = (com_level)GetChildAt(28);
btn_gold = (GButton)GetChildAt(30);
btn_head = (GButton)GetChildAt(31);
top_group = (GGroup)GetChildAt(32);
}
}
}
@@ -8,7 +8,7 @@ namespace FGUI.Privacy_24
public partial class com_privacy : GComponent
{
public Controller show;
public GButton btn_close;
public GButton btn_back;
public GList text_list;
public GTextField text_tips;
public GTextField title;
@@ -24,10 +24,10 @@ namespace FGUI.Privacy_24
base.ConstructFromXML(xml);
show = GetControllerAt(0);
btn_close = (GButton)GetChildAt(2);
text_list = (GList)GetChildAt(3);
text_tips = (GTextField)GetChildAt(4);
title = (GTextField)GetChildAt(5);
btn_back = (GButton)GetChildAt(1);
text_list = (GList)GetChildAt(2);
text_tips = (GTextField)GetChildAt(3);
title = (GTextField)GetChildAt(4);
}
}
}
+24 -7
View File
@@ -571,7 +571,7 @@ namespace ChillConnect
if (GameHelper.isRDExchangeMode()&&GameHelper.IsGiftSwitch())
{
string str = "<img src='ui://o9974uc5qbo98'/>";
return str + $"$ {ch:N0}";
return str + $"$ {ch:N}";
}
else
{
@@ -1077,6 +1077,17 @@ namespace ChillConnect
return 0;
}
public static bool IsShowOpenGameUI()
{
var vo = ConfigSystem.GetConfig<MakeupModel>().DataList;
if (GetLevel() > vo[^1].levels_need)
{
return false;
}
return true;
}
public static void SetItemNumber(int type, int value)
{
if (type == 0)
@@ -1378,13 +1389,19 @@ namespace ChillConnect
{
// if (!GameHelper.IsGiftSwitch())
var isGet = SaveData.GetSaveObject().IsGetFirstReward;
if (loginModel.NewPlayer || !isGet)
if (loginModel.NewPlayer || !isGet )
{
SaveData.GetSaveObject().IsGetFirstReward = true;
GameHelper.GetLoginModel().NewPlayer = false;
// PlayerPrefs.GetInt("FirstReward", 1);
var awardNum = ConfigSystem.GetConfig<CommonModel>().InitialNum;
addMoney(awardNum);
if (IsGiftSwitch())
{
SaveData.GetSaveObject().IsGetFirstReward = true;
SaveData.saveDataFunc();
GameHelper.GetLoginModel().NewPlayer = false;
// PlayerPrefs.GetInt("FirstReward", 1);
var awardNum = ConfigSystem.GetConfig<CommonModel>().InitialNum;
addMoney(awardNum);
GameDispatcher.Instance.Dispatch(GameMsg.Update102);
}
AddGoldNumber(50);
}
}
+12 -5
View File
@@ -30,7 +30,7 @@ namespace ChillConnect
private ConsumeSystem consumeSys;
private bool isFirstEnter = true;
public int enterHallTimes = 0;
public int openTipsTimes = 0;
public bool isShowRankView = false;
public event Action UpdateEvent;
private Camera _gameCamera;
@@ -104,7 +104,6 @@ namespace ChillConnect
{
// int index = obj != null ? (int)obj : 2;
enterHallTimes++;
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PlayUI_Close);
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.RewardAniUI_Close);
AudioManager.Instance.StopBGM();
@@ -170,12 +169,12 @@ namespace ChillConnect
private void OpenWb(object obj) {
// if (obj is not SDKOpenConfig openConfig) return;
if (obj is not SDKOpenConfig openConfig) return;
// SdkConfigMgr.Instance.Open(openConfig.normal, openConfig.url);
SetCameraVisible(false);
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.H5UI_Open, false);
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.H5UI_Open, openConfig);
GameDispatcher.Instance.Dispatch(GameMsg.hideBroadCast);
}
@@ -250,4 +249,12 @@ namespace ChillConnect
this.isInH5 = isInH5;
}
}
public class SDKOpenConfig
{
[JsonProperty("normal")]
public bool normal;
[JsonProperty("url")]
public string url;
}
}