tron_wz/ArrowBeatTap-Gp
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：1、添加主题更换。2、修复bug

Browse Source
This commit is contained in:
barry
2026-06-16 10:22:11 +08:00
parent 13f8d572c4
commit 19efcb09fa
45 changed files with 877 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/ChillConnect/Define/Message/UICtrlMsg_OpenClose.cs
+3 -1
View File
@@ -136,6 +136,8 @@ namespace ChillConnect
public static uint StatementViewUI_Open = ++cursor_OpenClose;
public static uint StatementViewUI_Close = ++cursor_OpenClose;
public static uint GameAgainUI_Open = ++cursor_OpenClose;
public static uint GameAgainUI_Close = ++cursor_OpenClose;
public static uint GameAgainUI_Close = ++cursor_OpenClose;
public static uint ArrowThemeUI_Open = ++cursor_OpenClose;
public static uint ArrowThemeUI_Close = ++cursor_OpenClose;
}
}
Assets/ChillConnect/FGUI/package/Arrow_Theme.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 71fa9dea88bf98e499c0019e2ba1103a
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/ChillConnect/FGUI/package/Arrow_Theme/Arrow_ThemeBinder.cs
+15
View File
@@ -0,0 +1,15 @@
/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
using FairyGUI;
namespace FGUI.Arrow_Theme
{
public class Arrow_ThemeBinder
{
public static void BindAll()
{
UIObjectFactory.SetPackageItemExtension(com_theme.URL, typeof(com_theme));
UIObjectFactory.SetPackageItemExtension(btn_switch.URL, typeof(btn_switch));
}
}
}
Assets/ChillConnect/FGUI/package/Arrow_game/btn_big.cs.meta → Assets/ChillConnect/FGUI/package/Arrow_Theme/Arrow_ThemeBinder.cs.meta
+1 -1
View File
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: abd26fd11b29a084b93baa0d815ca0e4
guid: 0fdfc674f2520c5438b329d198527648
MonoImporter:
externalObjects: {}
serializedVersion: 2
Assets/ChillConnect/FGUI/package/Arrow_Theme/btn_switch.cs
+25
View File
@@ -0,0 +1,25 @@
/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
using FairyGUI;
using FairyGUI.Utils;
namespace FGUI.Arrow_Theme
{
public partial class btn_switch : GButton
{
public Controller state;
public const string URL = "ui://nie197ferto36";
public static btn_switch CreateInstance()
{
return (btn_switch)UIPackage.CreateObject("Arrow_Theme", "btn_switch");
}
public override void ConstructFromXML(XML xml)
{
base.ConstructFromXML(xml);
state = GetControllerAt(0);
}
}
}
Assets/ChillConnect/FGUI/package/Arrow_Theme/btn_switch.cs.meta
+11
View File
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: fadc5d0fe42196844b1e8bf79cb4e8b9
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/ChillConnect/FGUI/package/Arrow_Theme/com_theme.cs
+33
View File
@@ -0,0 +1,33 @@
/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
using FairyGUI;
using FairyGUI.Utils;
namespace FGUI.Arrow_Theme
{
public partial class com_theme : GComponent
{
public GButton btn_dark;
public GButton btn_worm;
public GButton btn_colours;
public btn_switch btn_switch;
public GButton btn_close;
public const string URL = "ui://nie197ferto34";
public static com_theme CreateInstance()
{
return (com_theme)UIPackage.CreateObject("Arrow_Theme", "com_theme");
}
public override void ConstructFromXML(XML xml)
{
base.ConstructFromXML(xml);
btn_dark = (GButton)GetChildAt(6);
btn_worm = (GButton)GetChildAt(7);
btn_colours = (GButton)GetChildAt(8);
btn_switch = (btn_switch)GetChildAt(10);
btn_close = (GButton)GetChildAt(11);
}
}
}
Assets/ChillConnect/FGUI/package/Arrow_Theme/com_theme.cs.meta
+11
View File
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 7ef43e8e4c04a9c42a94f70f467c6353
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/ChillConnect/FGUI/package/Arrow_game/Arrow_gameBinder.cs
+4 -1
View File
@@ -14,7 +14,10 @@ namespace FGUI.Arrow_game
UIObjectFactory.SetPackageItemExtension(ArrorPoint.URL, typeof(ArrorPoint));
UIObjectFactory.SetPackageItemExtension(HeartsPanel.URL, typeof(HeartsPanel));
UIObjectFactory.SetPackageItemExtension(com_finger.URL, typeof(com_finger));
UIObjectFactory.SetPackageItemExtension(btn_big.URL, typeof(btn_big));
UIObjectFactory.SetPackageItemExtension(btn_saveingpot.URL, typeof(btn_saveingpot));
UIObjectFactory.SetPackageItemExtension(btn_petty.URL, typeof(btn_petty));
UIObjectFactory.SetPackageItemExtension(btn_green.URL, typeof(btn_green));
UIObjectFactory.SetPackageItemExtension(com_bottom.URL, typeof(com_bottom));
}
}
}
Assets/ChillConnect/FGUI/package/Arrow_game/btn_big.cs → Assets/ChillConnect/FGUI/package/Arrow_game/btn_green.cs
+5 -7
View File
@@ -5,16 +5,15 @@ using FairyGUI.Utils;
namespace FGUI.Arrow_game
{
public partial class btn_big : GButton
public partial class btn_green : GButton
{
public Controller state;
public GImage bg;
public GTextField text;
public const string URL = "ui://sjl9teijrsd4g";
public const string URL = "ui://sjl9teijrto31j";
public static btn_big CreateInstance()
public static btn_green CreateInstance()
{
return (btn_big)UIPackage.CreateObject("Arrow_game", "btn_big");
return (btn_green)UIPackage.CreateObject("Arrow_game", "btn_green");
}
public override void ConstructFromXML(XML xml)
@@ -22,8 +21,7 @@ namespace FGUI.Arrow_game
base.ConstructFromXML(xml);
state = GetControllerAt(0);
bg = (GImage)GetChildAt(0);
text = (GTextField)GetChildAt(1);
text = (GTextField)GetChildAt(2);
}
}
}
Assets/ChillConnect/FGUI/package/Arrow_game/btn_green.cs.meta
+11
View File
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 49df393f451adc24298d933d840cb2ce
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/ChillConnect/FGUI/package/Arrow_game/btn_petty.cs
+27
View File
@@ -0,0 +1,27 @@
/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
using FairyGUI;
using FairyGUI.Utils;
namespace FGUI.Arrow_game
{
public partial class btn_petty : GButton
{
public GGroup kuang;
public Transition t0;
public const string URL = "ui://sjl9teijrto31f";
public static btn_petty CreateInstance()
{
return (btn_petty)UIPackage.CreateObject("Arrow_game", "btn_petty");
}
public override void ConstructFromXML(XML xml)
{
base.ConstructFromXML(xml);
kuang = (GGroup)GetChildAt(4);
t0 = GetTransitionAt(0);
}
}
}
Assets/ChillConnect/FGUI/package/Arrow_game/btn_petty.cs.meta
+11
View File
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: fa4c32dcaf88f4541a805f3e01b38234
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/ChillConnect/FGUI/package/Arrow_game/btn_saveingpot.cs
+27
View File
@@ -0,0 +1,27 @@
/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
using FairyGUI;
using FairyGUI.Utils;
namespace FGUI.Arrow_game
{
public partial class btn_saveingpot : GButton
{
public GImage img;
public GTextField lab_time;
public const string URL = "ui://sjl9teijrto31e";
public static btn_saveingpot CreateInstance()
{
return (btn_saveingpot)UIPackage.CreateObject("Arrow_game", "btn_saveingpot");
}
public override void ConstructFromXML(XML xml)
{
base.ConstructFromXML(xml);
img = (GImage)GetChildAt(0);
lab_time = (GTextField)GetChildAt(1);
}
}
}
Assets/ChillConnect/FGUI/package/Arrow_game/btn_saveingpot.cs.meta
+11
View File
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 97ae33010cba77f4ea99d559bfa5664e
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/ChillConnect/FGUI/package/Arrow_game/com_arrow_game.cs
+18 -20
View File
@@ -8,20 +8,19 @@ namespace FGUI.Arrow_game
public partial class com_arrow_game : GComponent
{
public Controller mode;
public GButton btn_menu;
public GComponent view_container;
public ArrorPoint point;
public GButton btn_close;
public GComponent com_money;
public HeartsPanel HeartsPanel;
public GButton btn_clear;
public GButton btn_hint;
public com_finger com_finger;
public btn_big btn_big;
public btn_big btn_small;
public GSlider zoomSlide;
public GGraph samll_point;
public GTextField text_level;
public com_bottom com_bottom;
public btn_petty btn_petty;
public btn_saveingpot btn_saveingpot;
public GButton btn_statement;
public GButton btn_signin;
public const string URL = "ui://sjl9teijrsd40";
public static com_arrow_game CreateInstance()
@@ -34,20 +33,19 @@ namespace FGUI.Arrow_game
base.ConstructFromXML(xml);
mode = GetControllerAt(0);
btn_menu = (GButton)GetChildAt(2);
view_container = (GComponent)GetChildAt(3);
point = (ArrorPoint)GetChildAt(4);
btn_close = (GButton)GetChildAt(5);
com_money = (GComponent)GetChildAt(6);
HeartsPanel = (HeartsPanel)GetChildAt(7);
btn_clear = (GButton)GetChildAt(9);
btn_hint = (GButton)GetChildAt(10);
com_finger = (com_finger)GetChildAt(11);
btn_big = (btn_big)GetChildAt(12);
btn_small = (btn_big)GetChildAt(13);
zoomSlide = (GSlider)GetChildAt(14);
samll_point = (GGraph)GetChildAt(15);
text_level = (GTextField)GetChildAt(17);
view_container = (GComponent)GetChildAt(2);
point = (ArrorPoint)GetChildAt(3);
btn_close = (GButton)GetChildAt(4);
com_money = (GComponent)GetChildAt(5);
HeartsPanel = (HeartsPanel)GetChildAt(6);
com_finger = (com_finger)GetChildAt(7);
samll_point = (GGraph)GetChildAt(8);
text_level = (GTextField)GetChildAt(10);
com_bottom = (com_bottom)GetChildAt(12);
btn_petty = (btn_petty)GetChildAt(13);
btn_saveingpot = (btn_saveingpot)GetChildAt(14);
btn_statement = (GButton)GetChildAt(15);
btn_signin = (GButton)GetChildAt(16);
}
}
}
Assets/ChillConnect/FGUI/package/Arrow_game/com_bottom.cs
+33
View File
@@ -0,0 +1,33 @@
/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
using FairyGUI;
using FairyGUI.Utils;
namespace FGUI.Arrow_game
{
public partial class com_bottom : GComponent
{
public GButton btn_clear;
public GButton btn_hint;
public GSlider zoomSlide;
public GButton btn_skin;
public GButton btn_setting;
public const string URL = "ui://sjl9teijrto3x";
public static com_bottom CreateInstance()
{
return (com_bottom)UIPackage.CreateObject("Arrow_game", "com_bottom");
}
public override void ConstructFromXML(XML xml)
{
base.ConstructFromXML(xml);
btn_clear = (GButton)GetChildAt(2);
btn_hint = (GButton)GetChildAt(3);
zoomSlide = (GSlider)GetChildAt(4);
btn_skin = (GButton)GetChildAt(9);
btn_setting = (GButton)GetChildAt(10);
}
}
}
Assets/ChillConnect/FGUI/package/Arrow_game/com_bottom.cs.meta
+11
View File
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 0a31f5be9910fb94da64f7e655d673f6
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/ChillConnect/Manager/HallManager.cs
+40 -67
View File
@@ -79,37 +79,14 @@ namespace ChillConnect
{
lang = "en";
}
Debug.Log(ConfigSystem.GetConfig<CommonModel>().ExchangeModeToggle + "//////////////////////");
//初始化商品
// PurchasingManager.Instance.InitProduct();
var appleData = new ApplePayData
{
sku = "",
amount = 0,
currency = "USD",
shopName = "",
type = ""
};
// ApplePayManager.Instance.InitProduct(ConfigSystem.GetConfig<ApplePayModel2>().DataList,
// ConfigManager.GameConfig.packageName, PurchasingManager.ApplePaySuccessCallback(appleData));
Debug.Log(JsonConvert.SerializeObject(ConfigSystem.GetConfig<ApplePayModel>().DataList));
UIManager.Instance.SetSwitchLanguage(lang);
// UIManager.Instance.SetSwitchLanguage(lang);
EnterHall(true);
isGameStart = true;
TrackKit.TrackLoginFunnel(LoginFunnelEventType.EnterHall);
// Debug.Log("?????????????????" + PurchasingManager.GetPaySku(PayType.pack_reward));
// Debug.Log(JsonConvert.SerializeObject(ConfigSystem.GetConfig<ApplePayModel>().DataList));
// bool enterGame = CommonHelper.GetBoolByChance(ConfigSystem.GetConfig<CommonModel>().roomrate / 100f);
// if (GameHelper.IsGiftSwitch() && enterGame)
// {
// EnterGame(enterGame);
// }
// DOVirtual.DelayedCall(1f, PurchasingManager.StartPay);
}
private void SetSoundVolume()
@@ -130,50 +107,46 @@ namespace ChillConnect
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.RewardAniUI_Close);
AudioManager.Instance.StopBGM();
AudioManager.Instance.PlayBGM(AudioConst.MainBg);
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.MainUI_Open);
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ArrowGameUI_Open);
if (GameHelper.IsGiftSwitch() && (obj != null))
{
int h5rate = GameHelper.GetCommonModel().loginhallrate;
int roomrate = GameHelper.GetCommonModel().roomrate;
// if (UnityEngine.Random.Range(1, 100) < h5rate) {
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.H5UI_Open);
// } else
if (UnityEngine.Random.Range(1, 100) < roomrate)
{//进入玩法
GameHelper.is_first_login = false;
// OnClickPlay();
if (!SaveData.GetSaveObject().have_slot && (DateTime.Now.Day != PlayerPrefs.GetInt("off_new", 0)))
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.MainUI_Open);
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.AddviewnewUI_Open);
PlayerPrefs.SetInt("off_new", DateTime.Now.Day);
}
if (!SaveData.GetSaveObject().have_slot && UnityEngine.Random.Range(0, 100) < ConfigSystem.GetConfig<CommonModel>().BonusInside)
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.MainUI_Open);
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.AddviewnewUI_Open);
}
else
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.RainPlayUI_Open, true);
}
}
else
{
GameHelper.is_first_login = false;
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.MainUI_Open, true);
}
}
else
{
GameHelper.is_first_login = false;
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.MainUI_Open);
}
// if (GameHelper.IsGiftSwitch() && (obj != null))
// {
// int h5rate = GameHelper.GetCommonModel().loginhallrate;
// int roomrate = GameHelper.GetCommonModel().roomrate;
// // if (UnityEngine.Random.Range(1, 100) < h5rate) {
// // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.H5UI_Open);
// // } else
// if (UnityEngine.Random.Range(1, 100) < roomrate)
// {//进入玩法
//
// GameHelper.is_first_login = false;
// if (!SaveData.GetSaveObject().have_slot && (DateTime.Now.Day != PlayerPrefs.GetInt("off_new", 0)))
// {
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.MainUI_Open);
// PlayerPrefs.SetInt("off_new", DateTime.Now.Day);
// }
// if (!SaveData.GetSaveObject().have_slot && UnityEngine.Random.Range(0, 100) < ConfigSystem.GetConfig<CommonModel>().BonusInside)
// {
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.MainUI_Open);
// }
// else
// {
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.RainPlayUI_Open, true);
//
// }
// }
// else
// {
// GameHelper.is_first_login = false;
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.MainUI_Open, true);
// }
// }
// else
// {
// GameHelper.is_first_login = false;
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.MainUI_Open);
// }
if (GameHelper.IsGiftSwitch()) UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.BroadcastUI_Open);