Compare commits

...

3 Commits

Author SHA1 Message Date
zhangjiannan cd2bd84569 Merge branch 'master' of http://192.168.1.21:3000/root/sk-client
# Conflicts:
#	.gitignore
#	Assembly-CSharp-Editor-firstpass.csproj
#	Assembly-CSharp-Editor.csproj
#	Assembly-CSharp-firstpass.csproj
#	Assembly-CSharp.csproj
#	Assets/LuaFramework/Scenes/Logo.unity
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
#	ThinkingAnalytics.csproj
#	ThinkingSDK.csproj
#	Unity.AssetBundleBrowser.Editor.Tests.csproj
#	Unity.AssetBundleBrowser.Editor.csproj
#	Unity.Postprocessing.Editor.csproj
#	Unity.Postprocessing.Runtime.csproj
#	spine-unity-editor.csproj
#	spine-unity.csproj
2024-09-18 10:58:24 +08:00
zhangjiannan fad0c79675 1 2024-09-18 10:56:41 +08:00
zhangjiannan 1606cd3433 1 2024-09-18 10:56:11 +08:00
4 changed files with 20 additions and 4 deletions

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: