 DESKTOP-7R8JEQQ\k
|
3b4471f2b8
|
合并
|
2025-07-04 20:39:41 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
575c61a4f9
|
Merge branch 'master' into lps/chatroom.2025.7.4
# Conflicts:
# wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.6.bytes
# wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.7.bytes
# wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.6.bytes
# wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.6.bytes
# wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.6.bytes
# wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.6.bytes
# wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.6.bytes
|
2025-07-04 19:46:47 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
a5c1b71989
|
no message
|
2025-07-04 19:46:28 +08:00 |
 罗家炜
|
d87181cda1
|
全都bytes忽略
|
2025-07-04 19:38:38 +08:00 |
|
罗家炜
|
1b6415ca59
|
编辑玩法换图和修复bug
|
2025-07-04 19:36:00 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
7e73151fd8
|
Merge branch 'master' into lps/fonts.2025.7.4
# Conflicts:
# wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes
# wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png
# wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png
# wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_2.png
# wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_3.png
# wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_4.png
# wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_5.png
# wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_8.png
# wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes
|
2025-07-04 02:12:45 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
d37167d945
|
字体
|
2025-07-04 02:11:59 +08:00 |
|
罗家炜
|
4bf314879d
|
玩法管理修改
|
2025-07-04 02:06:24 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
f2bfeb2323
|
Merge branch 'master' into lps/emoji
# Conflicts:
# wb_new_ui/assets/Family/Main.xml
# wb_new_ui/assets/Family/Main/Component/c_familyMember.xml
# wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes
|
2025-07-04 01:00:14 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
19b6a21208
|
emoji
|
2025-07-04 00:27:03 +08:00 |
|
罗家炜
|
89c6b76f59
|
麻将换牌
|
2025-07-03 19:42:13 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
b1bb0a865f
|
Merge branch 'master' into lps/fonts.2025.7.3
# Conflicts:
# wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes
|
2025-07-03 00:05:32 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
8a076a8993
|
字体
|
2025-07-03 00:05:09 +08:00 |
|
罗家炜
|
e1cfb6650e
|
提交三四人麻将同步二人功能
|
2025-07-02 21:17:14 +08:00 |
|
罗家炜
|
4a6c3b3b07
|
解决冲突
|
2025-07-02 20:38:42 +08:00 |
|
罗家炜
|
b3db28766b
|
游戏背景
|
2025-07-02 20:37:27 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
a8a58ddb01
|
Merge branch 'master' into lps/fixBug.2025.7.2
|
2025-07-02 20:32:31 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
32cc672870
|
麻将适配
|
2025-07-02 20:30:58 +08:00 |
|
罗家炜
|
cdef6dcb91
|
解决冲突
|
2025-07-02 20:22:26 +08:00 |
|
罗家炜
|
b6a28f0987
|
提交
|
2025-07-02 20:18:16 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
7570ba54c8
|
删除art大小写
|
2025-07-02 20:15:38 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
573edc0de6
|
界面修改
|
2025-07-02 20:13:34 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
1f597d037d
|
Merge branch 'master' into lps/fixBug.2025.7.1-M
|
2025-07-02 17:19:54 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
c20f0a127a
|
界面修改，聊天室协议
|
2025-07-02 17:19:20 +08:00 |
|
罗家炜
|
d2d14c449a
|
Merge branch 'master' of http://121.41.95.54:3000/aga/jx_client
|
2025-07-02 17:16:15 +08:00 |
|
罗家炜
|
81f9cb6c1c
|
江西要求一
|
2025-07-02 17:14:49 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
8bc488315b
|
界面修改
|
2025-07-01 21:58:29 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
723531beb3
|
布局修改
|
2025-07-01 21:41:56 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
105d254992
|
界面修改调整、打开关闭聊天室协议
|
2025-07-01 19:31:19 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
0fe9c27acb
|
添加字体、解放房间修复、布局调整
|
2025-06-30 17:48:47 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
4455aaa25c
|
调试依赖文件诺位置
|
2025-06-27 21:35:45 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
f5335788dd
|
玩法bug修复中、调试文件
|
2025-06-27 21:33:42 +08:00 |
|
罗家炜
|
0fd486fe13
|
同步上传
|
2025-06-26 16:28:49 +08:00 |
|
罗家炜
|
b3542b2193
|
同步
|
2025-06-26 16:11:40 +08:00 |
|
罗家炜
|
e89ef3cc44
|
Merge branch 'master' of http://121.41.95.54:3000/aga/jx_client
|
2025-06-26 02:29:14 +08:00 |
|
罗家炜
|
8fe5500ebc
|
强制打开观战
|
2025-06-26 02:28:24 +08:00 |
|
罗家炜
|
075bf83357
|
上传东西
|
2025-06-26 01:57:35 +08:00 |
|
罗家炜
|
ab2c4df351
|
补充上传
|
2025-06-26 01:34:35 +08:00 |
|
罗家炜
|
ceaa9dfb55
|
gitigrone修复
|
2025-06-26 01:09:13 +08:00 |
|
罗家炜
|
cd87d521ad
|
回到分支
|
2025-06-26 01:00:37 +08:00 |
|
罗家炜
|
0686db8061
|
fariygui冲突
|
2025-06-26 00:52:49 +08:00 |
|
罗家炜
|
e480064fa2
|
合并冲突
|
2025-06-26 00:15:48 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
9cc8415a0c
|
添加字体、禁止观战
|
2025-06-25 23:14:16 +08:00 |
|
罗家炜
|
a7a53c2057
|
暴力合并other2
|
2025-06-25 22:49:44 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
f4cd51a641
|
同桌优化、创建亲友圈修复、添加多个字段
|
2025-06-25 22:21:05 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
e3fc53133d
|
合并ignore
|
2025-06-24 22:33:08 +08:00 |
|
罗家炜
|
aef31e30f8
|
补充差异
|
2025-06-24 22:24:56 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
933a5df897
|
Merge branch 'master' into lps/family5-M2
# Conflicts:
# wb_new_ui/assets/Family/package.xml
# wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png
# wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png
# wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes
|
2025-06-24 22:17:15 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
9a36d4145a
|
Merge branch 'master' into lps/family5-M
# Conflicts:
# wb_new_ui/assets/Family/package.xml
# wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png
# wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png
# wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes
|
2025-06-24 22:05:18 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
9cc8e006a4
|
禁止同桌协议调通，聊天室开始联调
|
2025-06-24 21:50:51 +08:00 |