shurongsen/Cute_demon_attacks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks

Browse Source
This commit is contained in:
wulongxiao 2024-12-24 16:44:12 +08:00
commit 3aa896198e
5 changed files with 3362 additions and 6612 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
meng_yao/Assets/Resources/preform/gui/Input_box.prefab
View File

@ -359,17 +359,35 @@ MonoBehaviour:
Name:
textName:
prompt:
prompt2:
is_required: 0
content:
Type: 0
icon: {fileID: 0}
icon2: {fileID: 0}
goldNumerobj:
nametext1:
numbertext1:
nametext2:
numbertext2:
widthnum: -1
WidthHeight: -1
Num: 0
details:
button_0_text:
button_1_text:
textobj: {fileID: 3337341074074513327}
promptobj: {fileID: 3337341073515583678}
promptobj2: {fileID: 0}
contentobj: {fileID: 3337341074177666619}
iconobj: {fileID: 0}
iconobj2: {fileID: 0}
goldNumerobj: {fileID: 0}
nametextobj1: {fileID: 0}
numbertextobj1: {fileID: 0}
nametextobj2: {fileID: 0}
numbertextobj2: {fileID: 0}
WidthObj: {fileID: 0}
--- !u!1 &3337341074074513327
GameObject:
m_ObjectHideFlags: 0

9940
meng_yao/Assets/Scenes/scene_Main.unity
View File

File diff suppressed because it is too large Load Diff

2
meng_yao/Assets/common

@ -1 +1 @@
Subproject commit e53cf6925cff55d1065ceba7a120bef0959e2749
Subproject commit eac4427f5efeda2d7bd9986c0c90e294ca5887a7

2
meng_yao/Assets/script/scene_Main/ui/IllustrationsAssetDetails.cs
View File

@ -33,7 +33,7 @@ public class IllustrationsAssetDetails : MonoBehaviour
if (WaterBtn != null)
{
WaterBtn.onClick.AddListener(() => {
mygameObject.GetComponent<Asset_Details>().ShowPanel(4);
mygameObject.GetComponent<Asset_Details>().ShowPanel(3);
});
}
}

12
meng_yao/Assets/script/scene_loading/Logo_in.cs
View File

@ -147,15 +147,13 @@ public class Logo_in : mount
List<BoxType> boxTypes = new List<BoxType>();
boxTypes.Add(new BoxType { Name = "account_number", textName = " 手机号", prompt = "请输入手机号", Type = 0, is_required = true });
if (Account == "")
{
Debug.Log("修改propomt");
boxTypes[0].prompt = "请输入手机号";
}else
if (Account != "")
{
boxTypes[0].prompt = Account;
boxTypes[0].content = Account;
Debug.Log(boxTypes[0].content);
}
boxTypes.Add(new BoxType { Name = "verification_code", textName = " 密码", prompt = "密码", Type = 0,is_required = true });
boxTypes.Add(new BoxType { Name = "verification_code", textName = " 密码", prompt = "密码", prompt2 = "请输入密码",Type = 0,is_required = true });
boxTypes.Add(new BoxType { Name = "submit", textName = " 取消确定 ",prompt = "取消",Type = 5 });
GameObject gameObject = add_pop_up(true); //生成弹窗母体
List<GameObject> gameObjects = gameObject.GetComponent<input_box_pop_up_window>().updateUI(boxTypes, "登录"); //测试输入框回调处理
@ -195,7 +193,7 @@ public class Logo_in : mount
{
List<BoxType> boxTypes = new List<BoxType>();
boxTypes.Add(new BoxType { Name = "account_number", textName = " 手机号", prompt = "请输入手机号", Type = 0, is_required = true });
boxTypes.Add(new BoxType { Name = "account_number", textName = " 手机号", prompt = "请输入手机号",Type = 0, is_required = true });
boxTypes.Add(new BoxType { Name = "verification_code", textName = " 验证码", prompt = "请输入验证码", Type = 1,nametext2 = "发送",is_required = true });
boxTypes.Add(new BoxType { Name = "sumbit", prompt = "密码登录", Type = 11,is_required = true });
boxTypes.Add(new BoxType { Name = "submit", textName = " 取消确定 ",prompt = "注册", Type = 5 });