lingmeng
/
jx_client_neibu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交一些小修改

master
罗家炜 2025-07-04 23:46:31 +08:00
parent 88b072aef4
commit e3b7a3b0aa
15 changed files with 61 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua
View File

@ -21,6 +21,7 @@ function FamilyNumberRecord.New(root, page)
self._data_minPage = page - 1
local group_id = self.group_id
local group = DataManager.groups:get(group_id)
local MJScore = 0
local PKScore = 0
local fgCtr = ControllerManager.GetController(NewGroupController)
@ -58,6 +59,7 @@ function FamilyNumberRecord.New(root, page)
self._viewText_titleRecord.text = string.format("%s 成员记录", self._text_groupTitle)
self._view:GetChild('text_residueDiamond').text = root._group.diamo
self._view:GetChild('text_timeRecord').text = os.date('%Y-%m-%d %H:%M:%S', os.time())
self._view:GetController('lev').selectedIndex = group.lev == 1 and 0 or 1
self:InitTimeAndSord()
self:NumverRecordRenderer(group_id)

2
lua_probject/base_project/Game/View/PlayerInfoView2.lua
View File

@ -36,7 +36,7 @@ function M:init()
local view = self._view
UIPackage.AddPackage('base/chat/ui/Chat')
self._tex_player_name = view:GetChild('name')
self._tex_score = view:GetChild('text_score')
self._tex_score = view:GetChild('text_jifen')
self._biaoqing = view:GetChild('face')
self._chat = view:GetChild('chat')

10
lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua
View File

@ -354,7 +354,7 @@ function M:EventInit()
local index = self:GetPos(win_seat)
local info = self._player_card_info[index]
self:RemoveCursor()
info:UpdateHandCard(false, true)
info:UpdateHandCard(false, false)
local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card_jiangxi")
obj_win_card.icon = "ui://Main_Majiang/202_" .. win_card
@ -488,17 +488,17 @@ function M:EventInit()
card_info:Clear()
card_info:ResetCardType()
if _room:checkHpNonnegative() then
p.cur_hp = data[i].hp_info.cur_hp
p.cur_hp = data[i].total_score
end
-- info:UpdateScore()
info._view:GetChild("zhanji").visible = true
local num = data[i].hp_info.total_hp
local num = data[i].total_score
if num >= 0 then
info._view:GetController("text_color").selectedIndex = 0
info._view:GetChild("text_jifen").text = "+" .. d2ad(num)
info._view:GetChild("text_jifen").text = "+" .. num
else
info._view:GetController("text_color").selectedIndex = 1
info._view:GetChild("text_jifen").text = d2ad(num)
info._view:GetChild("text_jifen").text = num
end
info._view:GetChild("mask_piao").title = ""

8
lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua
View File

@ -485,17 +485,17 @@ function M:EventInit()
card_info:Clear()
card_info:ResetCardType()
if _room:checkHpNonnegative() then
p.cur_hp = data[i].hp_info.cur_hp
p.cur_hp = data[i].total_score
end
-- info:UpdateScore()
info._view:GetChild("zhanji").visible = true
local num = data[i].hp_info.total_hp
local num = data[i].total_score
if num >= 0 then
info._view:GetController("text_color").selectedIndex = 0
info._view:GetChild("text_jifen").text = "+" .. d2ad(num)
info._view:GetChild("text_jifen").text = "+" .. num
else
info._view:GetController("text_color").selectedIndex = 1
info._view:GetChild("text_jifen").text = d2ad(num)
info._view:GetChild("text_jifen").text = num
end
info._view:GetChild("mask_piao").title = ""

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

@ -490,17 +490,17 @@ function M:EventInit()
card_info:Clear()
card_info:ResetCardType()
if _room:checkHpNonnegative() then
p.cur_hp = data[i].hp_info.cur_hp
p.cur_hp = data[i].total_score
end
-- info:UpdateScore()
info._view:GetChild("zhanji").visible = true
local num = data[i].hp_info.total_hp
local num = data[i].total_score
if num >= 0 then
info._view:GetController("text_color").selectedIndex = 0
info._view:GetChild("text_jifen").text = "+" .. d2ad(num)
info._view:GetChild("text_jifen").text = "+" .. num
else
info._view:GetController("text_color").selectedIndex = 1
info._view:GetChild("text_jifen").text = d2ad(num)
info._view:GetChild("text_jifen").text = num
end
info._view:GetChild("mask_piao").title = ""

10
lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua
View File

@ -353,7 +353,7 @@ function M:EventInit()
local index = self:GetPos(win_seat)
local info = self._player_card_info[index]
self:RemoveCursor()
info:UpdateHandCard(false, true)
info:UpdateHandCard(false, false)
local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card_jiangxi")
obj_win_card.icon = "ui://Main_Majiang/202_" .. win_card
@ -490,17 +490,17 @@ function M:EventInit()
card_info:Clear()
card_info:ResetCardType()
if _room:checkHpNonnegative() then
p.cur_hp = data[i].hp_info.cur_hp
p.cur_hp = data[i].total_score
end
-- info:UpdateScore()
info._view:GetChild("zhanji").visible = true
local num = data[i].hp_info.total_hp
local num = data[i].total_score
if num >= 0 then
info._view:GetController("text_color").selectedIndex = 0
info._view:GetChild("text_jifen").text = "+" .. d2ad(num)
info._view:GetChild("text_jifen").text = "+" .. num
else
info._view:GetController("text_color").selectedIndex = 1
info._view:GetChild("text_jifen").text = d2ad(num)
info._view:GetChild("text_jifen").text = num
end
info._view:GetChild("mask_piao").title = ""

2
wb_new_ui/assets/Family/Main/Component/btn_familyName.xml
View File

@ -8,7 +8,7 @@
<image id="n8_jrro" name="n8" src="jrro7cyb" fileName="Main/Image/btn_familyName_off.png" xy="0,0">
<gearDisplay controller="button" pages="0"/>
</image>
<richtext id="n9_jrro" name="title" xy="41,18" size="211,56" font="ui://27vd145bh35o7iln" fontSize="42" color="#2c1f16" text="亲友圈名称">
<richtext id="n9_jrro" name="title" xy="-1,18" size="296,56" font="ui://27vd145bh35o7iln" fontSize="42" color="#2c1f16" autoSize="ellipsis" text="亲友圈名称名称名">
<relation target="" sidePair="center-center,middle-middle"/>
</richtext>
</displayList>

29
wb_new_ui/assets/Family/NumberRecord/comp_numberRecord.xml
View File

@ -1,10 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="2532,1170">
<controller name="page" pages="0,,1,,2,,3," selected="0"/>
<controller name="page" pages="0,,1,,2,,3," selected="2"/>
<controller name="day" pages="0,,1," selected="0"/>
<controller name="sort" pages="0,,1," selected="0"/>
<controller name="limitDay" pages="0,,1," selected="0"/>
<controller name="noPeople" pages="0,,1," selected="0"/>
<controller name="lev" pages="0,,1," selected="0"/>
<displayList>
<text id="n0_lgoh" name="text_titleRecord" xy="264,22" size="2002,102" group="n73_lgoh" font="ui://27vd145bg2mo7ij0" fontSize="72" color="#ffffff" align="center" autoSize="none" shadowColor="#4c5058" shadowOffset="3,3" text="亲友圈xxxx（123456）成员记录">
<relation target="" sidePair="center-center"/>
@ -41,7 +42,7 @@
<image id="n18_lgoh" name="n18" src="c8pn7d02" fileName="Main/Image/Rectangle 93(1)(1).png" xy="21,145" size="2484,1011" group="n20_lgoh"/>
<image id="n19_lgoh" name="n19" src="c8pn7d03" fileName="Main/Image/Rectangle 122(1).png" xy="39,161" size="2448,978" group="n20_lgoh"/>
<group id="n20_lgoh" name="bg_numberRecordRank" xy="21,145" size="2484,1011" group="n63_lgoh"/>
<text id="n21_lgoh" name="text_timeRecord" xy="124,199" size="604,72" group="n47_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="54" color="#0000ed" bold="true" text="2025-04-11-01 18:58:25"/>
<text id="n21_lgoh" name="text_timeRecord" xy="124,199" size="660,72" group="n47_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="54" color="#0000ed" bold="true" text="2025-04-11-01 18:58:25"/>
<image id="n22_lgoh" name="n22" src="c8pn7czi" fileName="Main/Image/Rectangle 278.png" xy="226,328" size="438,72" group="n47_lgoh"/>
<text id="n23_lgoh" name="input_numberID" xy="248,328" size="344,72" group="n47_lgoh" fontSize="46" vAlign="middle" autoSize="shrink" bold="true" autoClearText="true" text="123456213" input="true"/>
<component id="n24_lgoh" name="btn_clearInput" src="qz7i7cwy" fileName="NumberRecord/Component/btn_clearInput.xml" xy="607,352" group="n47_lgoh"/>
@ -67,29 +68,29 @@
<text id="n32_lgoh" name="n32" xy="700,645" size="286,86" group="n47_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#a8312f" text="房卡消耗:">
<relation target="" sidePair="right-left,top-top"/>
</text>
<text id="n33_lgoh" name="n33" xy="198,807" size="158,86" group="n37_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#a8312f" bold="true" text="麻将(">
<text id="n33_lgoh" name="n33" xy="198,807" size="160,86" group="n37_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#a8312f" bold="true" text="麻将(">
<relation target="" sidePair="left-left"/>
</text>
<text id="n34_lgoh" name="text_score_majiang" xy="356,807" size="115,86" group="n37_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#0000ed" bold="true" singleLine="true" text="000">
<text id="n34_lgoh" name="text_score_majiang" xy="356,807" size="121,86" group="n37_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#0000ed" bold="true" singleLine="true" text="000">
<relation target="n33_lgoh" sidePair="left-right"/>
</text>
<component id="n35_lgoh" name="btn_changeMJScore" src="qz7i7cws" fileName="NumberDetail/Component/btn_change.xml" xy="984,816" group="n37_lgoh">
<relation target="n36_lgoh" sidePair="left-right"/>
</component>
<text id="n36_lgoh" name="n36" xy="471,806" size="488,86" group="n37_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#a8312f" bold="true" text=")分禁止进入牌局">
<text id="n36_lgoh" name="n36" xy="471,806" size="485,86" group="n37_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#a8312f" bold="true" text=")分禁止进入牌局">
<relation target="n34_lgoh" sidePair="left-right"/>
</text>
<group id="n37_lgoh" name="majiang" xy="198,806" size="912,87" group="n47_lgoh"/>
<text id="n38_lgoh" name="n38" xy="198,933" size="158,86" group="n42_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#a8312f" bold="true" text="扑克(">
<text id="n38_lgoh" name="n38" xy="198,933" size="160,86" group="n42_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#a8312f" bold="true" text="扑克(">
<relation target="" sidePair="left-left"/>
</text>
<text id="n39_lgoh" name="text_score_poker" xy="356,933" size="115,86" group="n42_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#0000ed" bold="true" singleLine="true" text="000">
<text id="n39_lgoh" name="text_score_poker" xy="356,933" size="121,86" group="n42_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#0000ed" bold="true" singleLine="true" text="000">
<relation target="n38_lgoh" sidePair="left-right"/>
</text>
<component id="n40_lgoh" name="btn_changePKScore" src="qz7i7cws" fileName="NumberDetail/Component/btn_change.xml" xy="984,942" group="n42_lgoh">
<relation target="n41_lgoh" sidePair="left-right"/>
</component>
<text id="n41_lgoh" name="n41" xy="471,933" size="488,86" group="n42_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#a8312f" bold="true" text=")分禁止进入牌局">
<text id="n41_lgoh" name="n41" xy="471,933" size="485,86" group="n42_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#a8312f" bold="true" text=")分禁止进入牌局">
<relation target="n39_lgoh" sidePair="left-right"/>
</text>
<group id="n42_lgoh" name="oiker" xy="198,933" size="912,86" group="n47_lgoh"/>
@ -142,9 +143,15 @@
<item/>
<item/>
</list>
<component id="n69_lgoh" name="btn_allChoose" src="jrro7cxq" fileName="NumberRecord/Component/btn_allChoose.xml" xy="389,1009" size="240,84" group="n72_lgoh"/>
<component id="n70_lgoh" name="btn_allChooseRead" src="jrro7cxs" fileName="NumberRecord/Component/btn_allChooseRead.xml" xy="1013,1009" size="240,84" group="n72_lgoh"/>
<component id="n71_lgoh" name="btn_allChooseReverse" src="jrro7cxr" fileName="NumberRecord/Component/btn_allChooseReverse.xml" xy="701,1009" size="240,84" group="n72_lgoh"/>
<component id="n69_lgoh" name="btn_allChoose" src="jrro7cxq" fileName="NumberRecord/Component/btn_allChoose.xml" xy="389,1009" size="240,84" group="n72_lgoh">
<gearDisplay controller="lev" pages="0"/>
</component>
<component id="n70_lgoh" name="btn_allChooseRead" src="jrro7cxs" fileName="NumberRecord/Component/btn_allChooseRead.xml" xy="1013,1009" size="240,84" group="n72_lgoh">
<gearDisplay controller="lev" pages="0"/>
</component>
<component id="n71_lgoh" name="btn_allChooseReverse" src="jrro7cxr" fileName="NumberRecord/Component/btn_allChooseReverse.xml" xy="701,1009" size="240,84" group="n72_lgoh">
<gearDisplay controller="lev" pages="0"/>
</component>
<group id="n72_lgoh" name="numberRecordDetail" xy="23,182" size="2484,960" group="n73_lgoh" advanced="true">
<gearDisplay controller="page" pages="2"/>
</group>

4
wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="132,132" initName="gcm_info">
<controller name="room_owner" pages="0,,1," selected="0"/>
<controller name="bank" pages="0,,1," selected="1"/>
<controller name="bank" pages="0,,1," selected="0"/>
<controller name="read" pages="0,,1," selected="0"/>
<controller name="offline" pages="0,,1," selected="0"/>
<controller name="mask_voice" pages="0,,1," selected="0"/>
@ -64,7 +64,7 @@
<component id="n41_7q1m" name="n41" src="gq7m67" fileName="ting.xml" xy="-3,7">
<gearDisplay controller="ting" pages="1"/>
</component>
<text id="n50_u633" name="text_jifen" xy="-10,126" size="153,58" group="n46_rfcn" font="ui://27vd145bg2mo7ij0" fontSize="43" color="#ffff99" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="0">
<text id="n50_u633" name="text_jifen" xy="-10,126" size="153,58" group="n46_rfcn" font="ui://27vd145bg2mo7ij0" fontSize="43" color="#ffff99" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="+33">
<gearColor controller="text_color" pages="0,1" values="#ffff99,#000000|#ff0000,#000000"/>
</text>
<group id="n46_rfcn" name="zhanji" xy="-10,126" size="153,58" advanced="true">

4
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_1.xml
View File

@ -24,12 +24,12 @@
<gearXY controller="3d" pages="0" values="616,-1303" default="616,100"/>
</image>
<text id="n36_gi99" name="Text_CardInfo" xy="900,258" size="813,973" visible="false" fontSize="30" autoSize="none" text="{&#xA;&quot;FZ_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Out_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Hand_Card&quot;:&quot;b201_&quot;,&#xA;&quot;Get_Card&quot;:&quot;b201_&quot;,&#xA;&quot;Order&quot;:&quot;desc&quot;,&#xA;&quot;Pos_X&quot;:57&#xA;}"/>
<list id="n33_gi99" name="List_FZ" xy="60,12" size="2517,158" touchable="false" layout="row" selectionMode="none" colGap="16" defaultItem="ui://v0j9abjygi9910f" autoClearItems="true">
<list id="n33_gi99" name="List_FZ" xy="7,12" size="2517,158" touchable="false" layout="row" selectionMode="none" colGap="16" defaultItem="ui://v0j9abjygi9910f" autoClearItems="true">
<relation target="" sidePair="width-width,height-height"/>
<item/>
<item/>
</list>
<list id="n32_kxhm" name="List_HandCard" xy="60,0" size="2135,186" layout="row" colGap="-4" defaultItem="ui://v0j9abjygi9910i" align="right" autoClearItems="true">
<list id="n32_kxhm" name="List_HandCard" xy="10,0" size="2135,186" layout="row" colGap="-4" defaultItem="ui://v0j9abjygi9910i" align="right" autoClearItems="true">
<item/>
<item/>
<item/>

BIN
wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes
View File

Binary file not shown.

14
wb_unity_pro/Assets/Plugins/Android/AndroidManifest.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.lbgame.sanmunb"
package="com.jxgame.qyhy"
android:versionCode="1"
android:versionName="1.0">
@ -23,7 +23,7 @@
android:label="@string/app_name"
android:theme="@style/UnityThemeSelector">
<activity
android:name="com.lbgame.sanmunb.MainActivity"
android:name="com.jxgame.qyhy.MainActivity"
android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|fontScale"
android:label="@string/app_name"
@ -43,13 +43,13 @@
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="lbgame" />
<data android:scheme="wx553b84f33be7a1ee" />
<data android:scheme="jxgame" />
<data android:scheme="wx00fe2d6c438ecd58" />
</intent-filter>
</activity>
<activity
android:name="com.lbgame.sanmunb.UnityPlayerActivity"
android:name="com.jxgame.qyhy.UnityPlayerActivity"
android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|fontScale"
android:label="@string/app_name"
android:launchMode="singleTask"
@ -57,13 +57,13 @@
<activity
android:name="com.lbgame.sanmunb.wxapi.WXEntryActivity"
android:name="com.jxgame.qyhy.wxapi.WXEntryActivity"
android:exported="true"
android:launchMode="singleTop" />
<provider
android:name="android.support.v4.content.FileProvider"
android:authorities="com.lbgame.sanmunb.provider"
android:authorities="com.jxgame.qyhy.provider"
android:exported="false"
android:grantUriPermissions="true">
<meta-data

BIN
wb_unity_pro/Assets/Plugins/Android/network.jar
View File

Binary file not shown.

4
wb_unity_pro/Assets/Scripts/Platform/WXData.cs
View File

@ -4,8 +4,8 @@ using System.Collections;
public static class WXData
{
const string _appId = "wx553b84f33be7a1ee";
const string _appSecret = "20f00273fe7af898660d63b733ed40fd";
const string _appId = "wx00fe2d6c438ecd58";
const string _appSecret = "8dd119676c2aa0f96ae15633a2423afb";
static string _accessToken;
static string _refreshToken;
static string _openid;

17
wb_unity_pro/ProjectSettings/ProjectSettings.asset
View File

@ -12,8 +12,8 @@ PlayerSettings:
targetDevice: 2
useOnDemandResources: 0
accelerometerFrequency: 60
companyName: sanmunbalone
productName: "\u6C5F\u897Falone"
companyName: qyhy
productName: "\u68CB\u6E90\u4E92\u5A31"
defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 0, g: 0, b: 0, a: 1}
@ -42,8 +42,7 @@ PlayerSettings:
m_SplashScreenLogos:
- logo: {fileID: 0}
duration: 2
m_VirtualRealitySplashScreen: {fileID: 2800000, guid: dda4728053c74c04cade51d6daf2f62f,
type: 3}
m_VirtualRealitySplashScreen: {fileID: 0}
m_HolographicTrackingLossScreen: {fileID: 0}
defaultScreenWidth: 560
defaultScreenHeight: 315
@ -171,7 +170,7 @@ PlayerSettings:
androidSupportedAspectRatio: 1
androidMaxAspectRatio: 2.1
applicationIdentifier:
Android: com.lbgame.sanmunb
Android: com.jxgame.qyhy
Standalone: unity.dy.qp0101
Tizen: com.dangdanggame.csyx5
iPhone: com.lbgame.sanmu
@ -179,8 +178,8 @@ PlayerSettings:
buildNumber:
iPhone: 1
AndroidBundleVersionCode: 12
AndroidMinSdkVersion: 19
AndroidTargetSdkVersion: 30
AndroidMinSdkVersion: 29
AndroidTargetSdkVersion: 29
AndroidPreferredInstallLocation: 1
aotOptions:
stripEngineCode: 0
@ -254,7 +253,7 @@ PlayerSettings:
templateDefaultScene:
AndroidTargetArchitectures: 1
AndroidSplashScreenScale: 2
androidSplashScreen: {fileID: 2800000, guid: c9916e46801228c468d9f8ab835ea725, type: 3}
androidSplashScreen: {fileID: 0}
AndroidKeystoreName: '{inproject}: smn.keystore'
AndroidKeyaliasName: smn
AndroidBuildApkPerCpuArchitecture: 0
@ -788,7 +787,7 @@ PlayerSettings:
platformArchitecture:
iPhone: 1
scriptingBackend:
Android: 0
Android: 1
Standalone: 1
iPhone: 1
il2cppCompilerConfiguration: {}