hengyang
/
hengyang_client
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并前提交

master
罗家炜 2025-08-26 19:30:13 +08:00
parent 1e519e4a60
commit 6c0a8a606b
9 changed files with 57 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua
View File

@ -575,6 +575,7 @@ function M:OutCard(card)
printlog("当前出牌为===>>>" .. card)
local _gamectr = ControllerManager.GetController(GameController)
self._room.curren_outcard_seat = -1
-- _gamectr:SendAction(0)
_gamectr:SendOutCard(card, function()
local info = self._player_card_info[1]
self:RemoveCursor()

1
lua_probject/extend_project/extend/zipai/yueyangwaihuzi_bak/PlayerSelfCardInfoView.lua
View File

@ -56,6 +56,7 @@ function M:__OnDragEnd(context)
-- -- print("button.y"..button.y .. "_room.curren_outcard_seat".._room.curren_outcard_seat)
local currentCtrS = IsHasDictionary(card.card_item, DataManager.CurrenRoom.self_player.currentNotPutCardList)
if currentCtrS == nil then currentCtrS = false end
if (button.y < -380 and _room.curren_outcard_seat == _room.self_player.seat) and currentCtrS == false then
button.touchable = false
self.outcard_button = card

2
wb_new_ui/assets/Family/Record/Component/Item_record.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="2328,150">
<controller name="jiesan_mng" pages="0,,1," selected="0"/>
<controller name="jiesan_mng" homePageType="specific" homePage="1" pages="0,,1," selected="0"/>
<displayList>
<image id="n0_slrk" name="n0" src="slrk7d34" fileName="Record/Image/Rectangle 182.png" xy="-11,-12" size="2349,170"/>
<image id="n2_slrk" name="n2" src="slrk7d35" fileName="Record/Image/Rectangle 187.png" xy="162,12"/>

3
wb_unity_pro/Assets/Plugins.meta
View File

@ -2,4 +2,7 @@ fileFormatVersion: 2
guid: e34dc6e361156f0439e74fa578a45650
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

3
wb_unity_pro/Assets/Plugins/x86_64.meta
View File

@ -2,4 +2,7 @@ fileFormatVersion: 2
guid: 7ea0a8e1f899b1148badb9e92b431566
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

44
wb_unity_pro/Assets/Plugins/x86_64/tolua.dll.meta
View File

@ -11,55 +11,24 @@ PluginImporter:
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
: Linux
second:
enabled: 0
settings:
CPU: None
- first:
: LinuxUniversal
second:
enabled: 0
settings:
CPU: x86_64
- first:
: OSXIntel
second:
enabled: 0
settings:
CPU: None
- first:
: OSXIntel64
second:
enabled: 1
settings:
CPU: AnyCPU
- first:
Android: Android
second:
enabled: 0
settings:
CPU: AnyCPU
- first:
Any:
second:
enabled: 0
enabled: 1
settings: {}
- first:
Editor: Editor
second:
enabled: 1
enabled: 0
settings:
CPU: x86_64
DefaultValueInitialized: true
OS: Windows
- first:
Standalone: Linux64
second:
enabled: 1
settings:
CPU: AnyCPU
CPU: x86_64
- first:
Standalone: OSXUniversal
second:
@ -78,13 +47,6 @@ PluginImporter:
enabled: 1
settings:
CPU: AnyCPU
- first:
iPhone: iOS
second:
enabled: 0
settings:
CompileFlags:
FrameworkDependencies:
userData:
assetBundleName:
assetBundleVariant:

80
wb_unity_pro/Logs/Packages-Update.log
View File

@ -1,45 +1,45 @@
=== Thu Apr 7 23:46:52 2022
=== Tue Aug 26 19:15:55 2025
Packages were changed.
Update Mode: mergeDefaultDependencies
Update Mode: resetToDefaultDependencies
The following packages were added:
com.unity.package-manager-ui@2.2.0
com.unity.ext.nunit@1.0.0
com.unity.test-framework@1.0.13
com.unity.ide.vscode@1.1.0
com.unity.ide.rider@1.1.0
com.unity.ugui@1.0.0
The following packages were 已添加:
com.unity.collab-proxy@1.2.16
com.unity.ide.rider@1.1.4
com.unity.ide.vscode@1.2.1
com.unity.modules.ai@1.0.0
com.unity.modules.androidjni@1.0.0
The following packages were updated:
com.unity.collab-proxy from version 1.2.9 to 1.2.16
com.unity.textmeshpro from version 2.0.0 to 2.0.1
com.unity.timeline from version 0.0.0-builtin to 1.1.0
=== Fri Apr 8 11:56:41 2022
Packages were changed.
Update Mode: updateDependencies
The following packages were updated:
com.unity.ide.rider from version 1.1.0 to 1.1.4
com.unity.ide.vscode from version 1.1.0 to 1.2.1
com.unity.test-framework from version 1.0.13 to 1.1.16
com.unity.timeline from version 1.1.0 to 1.2.6
The following packages were removed:
com.unity.package-manager-ui@2.2.0
=== Thu Apr 14 22:45:37 2022
Packages were changed.
Update Mode: updateDependencies
The following packages were added:
com.unity.2d.sprite@1.0.0
com.unity.2d.tilemap@1.0.0
com.unity.ads@3.4.9
com.unity.analytics@3.3.5
com.unity.multiplayer-hlapi@1.0.6
com.unity.purchasing@2.1.0
com.unity.xr.legacyinputhelpers@2.1.4
com.unity.modules.animation@1.0.0
com.unity.modules.assetbundle@1.0.0
com.unity.modules.audio@1.0.0
com.unity.modules.cloth@1.0.0
com.unity.modules.director@1.0.0
com.unity.modules.imageconversion@1.0.0
com.unity.modules.imgui@1.0.0
com.unity.modules.jsonserialize@1.0.0
com.unity.modules.particlesystem@1.0.0
com.unity.modules.physics@1.0.0
com.unity.modules.physics2d@1.0.0
com.unity.modules.screencapture@1.0.0
com.unity.modules.terrain@1.0.0
com.unity.modules.terrainphysics@1.0.0
com.unity.modules.tilemap@1.0.0
com.unity.modules.ui@1.0.0
com.unity.modules.uielements@1.0.0
com.unity.modules.umbra@1.0.0
com.unity.modules.unityanalytics@1.0.0
com.unity.modules.unitywebrequest@1.0.0
com.unity.modules.unitywebrequestassetbundle@1.0.0
com.unity.modules.unitywebrequestaudio@1.0.0
com.unity.modules.unitywebrequesttexture@1.0.0
com.unity.modules.unitywebrequestwww@1.0.0
com.unity.modules.vehicles@1.0.0
com.unity.modules.video@1.0.0
com.unity.modules.vr@1.0.0
com.unity.modules.wind@1.0.0
com.unity.modules.xr@1.0.0
com.unity.test-framework@1.1.16
com.unity.textmeshpro@2.1.1
com.unity.timeline@1.2.16
com.unity.ugui@1.0.0

13
wb_unity_pro/Packages/manifest.json
View File

@ -1,21 +1,12 @@
{
"dependencies": {
"com.unity.2d.sprite": "1.0.0",
"com.unity.2d.tilemap": "1.0.0",
"com.unity.ads": "3.4.9",
"com.unity.analytics": "3.3.5",
"com.unity.collab-proxy": "1.2.16",
"com.unity.device-simulator": "3.0.3-preview",
"com.unity.ext.nunit": "1.0.0",
"com.unity.ide.rider": "1.1.4",
"com.unity.ide.vscode": "1.2.1",
"com.unity.multiplayer-hlapi": "1.0.6",
"com.unity.purchasing": "2.1.0",
"com.unity.test-framework": "1.1.16",
"com.unity.textmeshpro": "2.0.1",
"com.unity.timeline": "1.2.6",
"com.unity.textmeshpro": "2.1.1",
"com.unity.timeline": "1.2.16",
"com.unity.ugui": "1.0.0",
"com.unity.xr.legacyinputhelpers": "2.1.4",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
"com.unity.modules.animation": "1.0.0",

75
wb_unity_pro/Packages/packages-lock.json
View File

@ -1,35 +1,5 @@
{
"dependencies": {
"com.unity.2d.sprite": {
"version": "1.0.0",
"depth": 0,
"source": "builtin",
"dependencies": {}
},
"com.unity.2d.tilemap": {
"version": "1.0.0",
"depth": 0,
"source": "builtin",
"dependencies": {}
},
"com.unity.ads": {
"version": "3.4.9",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.ugui": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.analytics": {
"version": "3.3.5",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.ugui": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.collab-proxy": {
"version": "1.2.16",
"depth": 0,
@ -37,16 +7,9 @@
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.device-simulator": {
"version": "3.0.3-preview",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.ext.nunit": {
"version": "1.0.0",
"depth": 0,
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
@ -67,24 +30,6 @@
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.multiplayer-hlapi": {
"version": "1.0.6",
"depth": 0,
"source": "registry",
"dependencies": {
"nuget.mono-cecil": "0.1.6-preview"
},
"url": "https://packages.unity.com"
},
"com.unity.purchasing": {
"version": "2.1.0",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.ugui": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.test-framework": {
"version": "1.1.16",
"depth": 0,
@ -97,7 +42,7 @@
"url": "https://packages.unity.com"
},
"com.unity.textmeshpro": {
"version": "2.0.1",
"version": "2.1.1",
"depth": 0,
"source": "registry",
"dependencies": {
@ -106,7 +51,7 @@
"url": "https://packages.unity.com"
},
"com.unity.timeline": {
"version": "1.2.6",
"version": "1.2.16",
"depth": 0,
"source": "registry",
"dependencies": {},
@ -121,20 +66,6 @@
"com.unity.modules.imgui": "1.0.0"
}
},
"com.unity.xr.legacyinputhelpers": {
"version": "2.1.4",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"nuget.mono-cecil": {
"version": "0.1.6-preview",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.modules.ai": {
"version": "1.0.0",
"depth": 0,