fix:1、同步ios修复的bug

This commit is contained in:
2026-07-01 10:26:18 +08:00
parent 6ff428bdf2
commit af7617c352
1080 changed files with 2059 additions and 484310 deletions
@@ -63,5 +63,7 @@ namespace ChillConnect
public static uint UpdateSpeed = ++Cursor_BASE;
public static uint UseProps = ++Cursor_BASE;
public static uint StopArrowTouch = ++Cursor_BASE;
public static uint refreshGift = ++Cursor_BASE;
}
}
@@ -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
@@ -8,6 +8,7 @@ namespace FGUI.Arrow_game
{
public static void BindAll()
{
UIObjectFactory.SetPackageItemExtension(com_gift.URL, typeof(com_gift));
UIObjectFactory.SetPackageItemExtension(com_arrow_game.URL, typeof(com_arrow_game));
UIObjectFactory.SetPackageItemExtension(ArrowEnd.URL, typeof(ArrowEnd));
UIObjectFactory.SetPackageItemExtension(LineTile.URL, typeof(LineTile));
@@ -7,7 +7,9 @@ namespace FGUI.Arrow_game
{
public partial class btn_watch : GButton
{
public Controller can;
public GImage bg;
public GImage img_saveingpot;
public GTextField text;
public const string URL = "ui://sjl9teijrsd4g";
@@ -20,8 +22,10 @@ namespace FGUI.Arrow_game
{
base.ConstructFromXML(xml);
can = GetControllerAt(0);
bg = (GImage)GetChildAt(0);
text = (GTextField)GetChildAt(1);
img_saveingpot = (GImage)GetChildAt(1);
text = (GTextField)GetChildAt(2);
}
}
}
@@ -8,6 +8,7 @@ namespace FGUI.Arrow_game
public partial class com_arrow_game : GComponent
{
public Controller mode;
public Controller state;
public com_flicker com_ficker;
public view_container_parent view_container_parent;
public ArrorPoint point;
@@ -17,12 +18,16 @@ namespace FGUI.Arrow_game
public GGraph samll_point;
public GTextField text_level;
public com_bottom com_bottom;
public GButton btn_signin;
public btn_petty btn_petty;
public btn_saveingpot btn_saveingpot;
public GButton btn_statement;
public GButton btn_signin;
public GGroup panel;
public com_finger com_finger;
public GButton btn_wv;
public GProgressBar ch_progress;
public GButton com_gem;
public com_gift com_gift;
public Transition t1;
public const string URL = "ui://sjl9teijrsd40";
@@ -36,6 +41,7 @@ namespace FGUI.Arrow_game
base.ConstructFromXML(xml);
mode = GetControllerAt(0);
state = GetControllerAt(1);
com_ficker = (com_flicker)GetChildAt(2);
view_container_parent = (view_container_parent)GetChildAt(3);
point = (ArrorPoint)GetChildAt(4);
@@ -45,12 +51,16 @@ namespace FGUI.Arrow_game
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);
btn_signin = (GButton)GetChildAt(13);
btn_petty = (btn_petty)GetChildAt(14);
btn_saveingpot = (btn_saveingpot)GetChildAt(15);
btn_statement = (GButton)GetChildAt(16);
panel = (GGroup)GetChildAt(17);
com_finger = (com_finger)GetChildAt(18);
ch_progress = (GProgressBar)GetChildAt(19);
btn_wv = (GButton)GetChildAt(19);
ch_progress = (GProgressBar)GetChildAt(20);
com_gem = (GButton)GetChildAt(21);
com_gift = (com_gift)GetChildAt(22);
t1 = GetTransitionAt(0);
}
}
@@ -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_game
{
public partial class com_gift : GComponent
{
public GTextField text_gift;
public const string URL = "ui://sjl9teijq8to1u";
public static com_gift CreateInstance()
{
return (com_gift)UIPackage.CreateObject("Arrow_game", "com_gift");
}
public override void ConstructFromXML(XML xml)
{
base.ConstructFromXML(xml);
text_gift = (GTextField)GetChildAt(2);
}
}
}
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 36e3850568fb04efcaffed0b7f4c8462
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
@@ -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);
}
}
}
@@ -34,13 +34,13 @@ namespace FGUI.Reward_10
cont_white = GetControllerAt(1);
state = GetControllerAt(2);
gift = GetControllerAt(3);
fx_place = (GGraph)GetChildAt(4);
text_num = (GTextField)GetChildAt(5);
loader_icon0 = (GLoader)GetChildAt(7);
text_num1 = (GTextField)GetChildAt(8);
wheel = (GComponent)GetChildAt(9);
btn_multi = (GButton)GetChildAt(10);
btn_collect = (GButton)GetChildAt(11);
fx_place = (GGraph)GetChildAt(3);
text_num = (GTextField)GetChildAt(4);
loader_icon0 = (GLoader)GetChildAt(6);
text_num1 = (GTextField)GetChildAt(7);
wheel = (GComponent)GetChildAt(8);
btn_multi = (GButton)GetChildAt(9);
btn_collect = (GButton)GetChildAt(10);
t0 = GetTransitionAt(0);
}
}
@@ -10,12 +10,12 @@ namespace FGUI.Signin_19
public Controller status;
public Controller day;
public Controller isGift;
public GTextField reward_num;
public GGraph anim_sign;
public GLoader loader_icon0;
public GTextField text_prop;
public GTextField reward_num1;
public GImage gou;
public GRichTextField reward_num;
public const string URL = "ui://a98xmhwkebok1z";
public static btn_sign CreateInstance()
@@ -30,12 +30,12 @@ namespace FGUI.Signin_19
status = GetControllerAt(0);
day = GetControllerAt(1);
isGift = GetControllerAt(2);
reward_num = (GTextField)GetChildAt(7);
anim_sign = (GGraph)GetChildAt(10);
loader_icon0 = (GLoader)GetChildAt(11);
text_prop = (GTextField)GetChildAt(12);
reward_num1 = (GTextField)GetChildAt(13);
gou = (GImage)GetChildAt(14);
anim_sign = (GGraph)GetChildAt(9);
loader_icon0 = (GLoader)GetChildAt(10);
text_prop = (GTextField)GetChildAt(11);
reward_num1 = (GTextField)GetChildAt(12);
gou = (GImage)GetChildAt(13);
reward_num = (GRichTextField)GetChildAt(14);
}
}
}
@@ -30,18 +30,18 @@ namespace FGUI.Signin_19
{
base.ConstructFromXML(xml);
day1 = (btn_sign)GetChildAt(2);
day2 = (btn_sign)GetChildAt(3);
day3 = (btn_sign)GetChildAt(4);
day4 = (btn_sign)GetChildAt(5);
day5 = (btn_sign)GetChildAt(6);
day6 = (btn_sign)GetChildAt(7);
day7 = (btn_sign)GetChildAt(8);
close = (GButton)GetChildAt(9);
point = (GGraph)GetChildAt(10);
point1 = (GGraph)GetChildAt(11);
com_gold = (GButton)GetChildAt(12);
btn_collect = (GButton)GetChildAt(13);
day1 = (btn_sign)GetChildAt(1);
day2 = (btn_sign)GetChildAt(2);
day3 = (btn_sign)GetChildAt(3);
day4 = (btn_sign)GetChildAt(4);
day5 = (btn_sign)GetChildAt(5);
day6 = (btn_sign)GetChildAt(6);
day7 = (btn_sign)GetChildAt(7);
close = (GButton)GetChildAt(8);
point = (GGraph)GetChildAt(9);
point1 = (GGraph)GetChildAt(10);
com_gold = (GButton)GetChildAt(11);
btn_collect = (GButton)GetChildAt(12);
}
}
}
@@ -0,0 +1,25 @@
/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
using FairyGUI;
using FairyGUI.Utils;
namespace FGUI.tixian
{
public partial class btn_getcash : GButton
{
public GImage img_saveingpot;
public const string URL = "ui://md8tkwlzupx71u";
public static btn_getcash CreateInstance()
{
return (btn_getcash)UIPackage.CreateObject("tixian", "btn_getcash");
}
public override void ConstructFromXML(XML xml)
{
base.ConstructFromXML(xml);
img_saveingpot = (GImage)GetChildAt(3);
}
}
}
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 712454ebe18c44a2ea5756b3a01d7ba6
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
@@ -31,6 +31,7 @@ namespace FGUI.tixian
UIObjectFactory.SetPackageItemExtension(btn_code.URL, typeof(btn_code));
UIObjectFactory.SetPackageItemExtension(com_saveingpot.URL, typeof(com_saveingpot));
UIObjectFactory.SetPackageItemExtension(btn_top.URL, typeof(btn_top));
UIObjectFactory.SetPackageItemExtension(btn_getcash.URL, typeof(btn_getcash));
UIObjectFactory.SetPackageItemExtension(com_confirm.URL, typeof(com_confirm));
UIObjectFactory.SetPackageItemExtension(com_record.URL, typeof(com_record));
}
+30 -12
View File
@@ -126,7 +126,7 @@ namespace ChillConnect
if (DataMgr.NewWatchCd.Value.Count == 0)
{
for (int i = 0; i < 5; i++)
for (int i = 0; i < 7; i++)
{
DataMgr.NewWatchCd.Value.Add(0);
}
@@ -459,7 +459,7 @@ namespace ChillConnect
//is debug test--------
return true;//zhushi
// return true;//zhushi
// return false;//zhushi
// return false;//zhushi
return GetLoginModel().IsMagic;
@@ -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
{
@@ -581,7 +581,8 @@ namespace ChillConnect
public static string getChNumber(decimal ch)
{
return $"{ch:N}";
string str = "<img src='ui://o9974uc5qbo98'/>";
return str + $"$ {ch:N}";
}
public static string GetDeviceLanguage()
@@ -610,7 +611,7 @@ namespace ChillConnect
var url = $"mailto:{email}?subject={subject}&body={body}";
var uri = new Uri(url);
Application.OpenURL(uri.AbsoluteUri);
OpenBrowser.OpenURL(uri.AbsoluteUri);
GameHelper.ShowTips("Trying to call send mail...");
}
@@ -1076,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)
@@ -1116,7 +1128,7 @@ namespace ChillConnect
public static int GetLevel()
{
// DataMgr.GameLevel.Value = 500;//zhushi
// DataMgr.GameLevel.Value = 13;//zhushi
return DataMgr.GameLevel.Value;
}
@@ -1377,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 -6
View File
@@ -1,7 +1,6 @@
using DG.Tweening;
using IgnoreOPS;
using SGModule.Net;
using UNSDK;
namespace ChillConnect
{
@@ -31,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;
@@ -105,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();
@@ -172,11 +170,11 @@ namespace ChillConnect
private void OpenWb(object obj) {
if (obj is not SDKOpenConfig openConfig) return;
SdkConfigMgr.Instance.Open(openConfig.normal, openConfig.url);
// 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);
}
@@ -251,4 +249,12 @@ namespace ChillConnect
this.isInH5 = isInH5;
}
}
public class SDKOpenConfig
{
[JsonProperty("normal")]
public bool normal;
[JsonProperty("url")]
public string url;
}
}