DESKTOP-RH64908\Administrator 2024-10-15 15:34:42 +08:00
commit 8fcd9c1704
6 changed files with 23 additions and 6 deletions

1
.gitignore vendored
View File

@ -7,3 +7,4 @@ Temp/
/xcodes
/obj
/.vs
/.vscode

View File

@ -19,7 +19,7 @@ MonoBehaviour:
defaultInstantiateLoop: 1
showHierarchyIcons: 1
setTextureImporterSettings: 1
textureSettingsReference:
textureSettingsReference: Assets/Spine/Editor/spine-unity/Editor/ImporterPresets/PMATexturePreset.preset
blendModeMaterialMultiply: {fileID: 0}
blendModeMaterialScreen: {fileID: 0}
blendModeMaterialAdditive: {fileID: 0}

View File

@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: 83cf30c5b8fffbb4486da15ecdbd3d40
guid: a141cf4ba52496b4b943de0e1881ab20
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName: lzma/luabytes
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,9 @@
diff a/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendMainPanel.lua (rejected hunks)
@@ -754,6 +754,7 @@
this.maskText.text = this.friendApplicationText.text
this.maskText.transform.localPosition = this.maskTextCurPos
-- GoodFriendManager.RefreshFriendStateRequest()
+ --
elseif index == 3 then
this.friendList:SetActive(false)
this.friendApplication:SetActive(false)

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: b9ac8c55b2b238e40b69d0aaae0685fa
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -17,7 +17,7 @@ namespace GameEditor.FrameTool
/// <summary>
/// 本地服
/// </summary>
[ServerPathTypeValue("http://192.168.10.99:8080/", null, null, null, null, "dev")]
[ServerPathTypeValue("http://192.168.1.24:8088/", null, null, null, null, "dev")]
= -1,
/// <summary>
@ -29,7 +29,7 @@ namespace GameEditor.FrameTool
/// <summary>
/// 杜辉本地服
/// </summary>
[ServerPathTypeValue("http://192.168.1.23:8080/", "http://cfzl-1257713232.cos.ap-beijing.myqcloud.com/shiKongTest", null, null, null, "dev")]
[ServerPathTypeValue("http://192.168.1.23:8088/", "http://cfzl-1257713232.cos.ap-beijing.myqcloud.com/shiKongTest", null, null, null, "dev")]
,
/// <summary>
/// 时空测试服