Commit Graph

9851 Commits (89cc2595e1b8d77d5f7146eee0b4b4c70d53e6da)

Author SHA1 Message Date
DESKTOP-MMO982B\User 89cc2595e1 数字小游戏相关调整 2025-02-26 17:34:51 +08:00
DESKTOP-MMO982B\User 240d75c93a 111 2025-02-26 15:53:36 +08:00
DESKTOP-MMO982B\User 83a1bc5d57 天赋图标修改 2025-03-21 17:36:34 +08:00
DESKTOP-MMO982B\User cc2cf23943 页面修改 2025-03-21 17:31:12 +08:00
DESKTOP-MMO982B\User 8ad4f1fd32 添加更改 2025-03-21 15:00:00 +08:00
DESKTOP-MMO982B\User 456fb83d83 111 2025-02-20 18:20:58 +08:00
DESKTOP-RH64908\Administrator 36e7c66fca Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu
# Conflicts:
#	Assets/ManagedResources/Atlas/ExploreAtlas/r_tongyong_leijishouyi.png.meta
#	Assets/ManagedResources/Atlas/ExploreAtlas/t_tansuo_jindutubiao.png.meta
#	Assets/ManagedResources/Atlas/GMAltas/gm_shop_item_bg.png.meta
#	Assets/ManagedResources/Atlas/GMAltas/gm_shuachong_info_bg.png.meta
#	Assets/ManagedResources/Atlas/GMAltas/gm_sswzc_bg2.png.meta
#	Assets/ManagedResources/Atlas/GuildAtlas/ArtFont/r_gonghui_toubiao_01_zh.png.meta
#	Assets/ManagedResources/Atlas/GuildAtlas/ArtFont/r_gonghui_toubiao_02_zh.png.meta
#	Assets/ManagedResources/Atlas/GuildAtlas/ArtFont/s_shop_yijisi_zh.png.meta
#	Assets/ManagedResources/Atlas/SurpriseBoxAtlas/j_jingxilihe_guizitai.png.meta
#	Assets/ManagedResources/Atlas/SurpriseBoxAtlas/j_jingxilihe_muguijia.png.meta
#	Assets/ManagedResources/BG/UI/1All/X1_tongyong_liebiao_03.png.meta
#	Assets/ManagedResources/BG/UI/1All/X1_tongyong_liebiao_04.png.meta
#	Assets/ManagedResources/BG/UI/1All/X1_tongyong_liebiao_08.png.meta
#	Assets/ManagedResources/BG/UI/Common/UI_hz_qianneng_36.png.meta
#	Assets/ManagedResources/BG/UI/Common/UI_hz_qianneng_38.png.meta
#	Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe05_11.png.meta
#	Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe05_112.png.meta
#	Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe05_80.png.meta
#	Assets/ManagedResources/BG/UI/CommonIcons/UI_hz_zhonghe10.png.meta
#	Assets/ManagedResources/BG/UI/DailyMission/UI_hz_richang_Bg.png.meta
#	Assets/ManagedResources/BG/UI/Guild/UI_hz_zhonghe03_58.png.meta
#	Assets/ManagedResources/BG/UI/Login/UI_hz_zhonghe01_29.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0027_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0028_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0029_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0033_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0034_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0035_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0036_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0037_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0038_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0039_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0041_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0042_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0043_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0044_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0045_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0048_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0049_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0050_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0053_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0054_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0055_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0056_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0057_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_ab_00014_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_bgj_00091_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_cff_0049_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_cff_0078_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_dj_0008_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_dz_00058_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_fhlh_00021_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_ghn_0009_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_gy_00092_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0001_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0002_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0003_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0004_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0005_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0006_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0007_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0008_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0009_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0010_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0011_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0012_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0013_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0014_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0015_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0016_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0017_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0018_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0019_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0020_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0021_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0022_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0023_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0024_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0025_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_hyt_0032_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_jbj_0007_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_jlzz_00060_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_jzy_00043_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_lslz_00046_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_lsx_00069_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_lzz_0002_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_md_00064_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_mp_00051_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_nz_00029_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_swk_00015_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_ts_00017_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_ttjz_00048_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_wsps_00016_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_xllh_00022_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_yc_00052_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_yj_00040_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_yn_009_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_zn_tx_001_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/livetu_ainilu.png.meta
#	Assets/ManagedResources/Icon/Hero/livetu_chushisuolong.png.meta
#	Assets/ManagedResources/Icon/Hero/livetu_chushiwusuopu.png.meta
#	Assets/ManagedResources/Icon/Hero/livetu_kapu.png.meta
#	Assets/ManagedResources/Icon/Hero/livetu_leili.png.meta
#	Assets/ManagedResources/Icon/Hero/livetu_tenghu.png.meta
2025-02-10 20:21:59 +08:00
DESKTOP-RH64908\Administrator 8d4c3a2213 1 2025-02-10 20:20:21 +08:00
PC-202302260912\Administrator dfb8e416db 优化页面背包和图鉴 2025-02-06 15:08:06 +08:00
PC-202302260912\Administrator ecc7a86683 优化页面 2025-01-11 18:40:43 +08:00
PC-202302260912\Administrator 5e6352461a 修改按钮 2025-01-02 20:09:26 +08:00
DESKTOP-RH64908\Administrator 6518c7fc0f 1 2024-12-24 18:56:54 +08:00
PC-202302260912\Administrator 2bdfe997fc 优化界面 2024-12-24 18:46:21 +08:00
DESKTOP-RH64908\Administrator 95b398dba2 1 2024-12-24 18:00:06 +08:00
DESKTOP-RH64908\Administrator 158044eb1a 1 2024-12-24 16:57:38 +08:00
DESKTOP-RH64908\Administrator 4e44959920 1 2024-12-24 16:34:23 +08:00
PC-202302260912\Administrator 4e630f38c1 添加优化 2024-12-24 14:34:29 +08:00
DESKTOP-RH64908\Administrator cb406e19d9 Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu 2024-12-24 13:46:02 +08:00
DESKTOP-RH64908\Administrator a28184da90 1 2024-12-24 13:45:44 +08:00
PC-202302260912\Administrator b61118a8dd 优化页面 2024-12-23 20:14:39 +08:00
PC-202302260912\Administrator 785b74dbdc 框底替换 2024-12-23 19:21:47 +08:00
DESKTOP-RH64908\Administrator b52b00b4e1 Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu 2024-12-23 19:03:27 +08:00
DESKTOP-RH64908\Administrator f0bde7e48c 1 2024-12-23 18:51:04 +08:00
PC-202302260912\Administrator 7de91cc10a 页面按钮修改 2024-12-23 17:11:26 +08:00
PC-202302260912\Administrator 70909e0fc6 龙珠页面修改 2024-12-23 16:21:08 +08:00
PC-202302260912\Administrator 710ef8af04 优化页面 2024-12-18 16:27:07 +08:00
PC-202302260912\Administrator 5d3a649afb 奥义卡修改 2024-12-13 16:36:10 +08:00
PC-202302260912\Administrator b5e8846e41 主界面优化 2024-12-13 15:31:51 +08:00
PC-202302260912\Administrator 8a95a5617d 奥义卡页面优化 2024-12-09 12:59:28 +08:00
PC-202302260912\Administrator c65f52522a 修改界面 2024-12-05 19:12:12 +08:00
PC-202302260912\Administrator 3a2f28d699 优化界面 2024-12-05 17:15:59 +08:00
PC-202302260912\Administrator 6d9e176164 优化页面1 2024-12-02 14:11:16 +08:00
DESKTOP-RH64908\Administrator 838a42cfad Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu
# Conflicts:
#	Assets/StreamingAssets/Android.meta
2024-11-22 20:14:14 +08:00
DESKTOP-RH64908\Administrator 351f192b82 1 2024-11-22 20:12:01 +08:00
PC-202302260912\Administrator 8a1a77bd52 修改海贼相关引用 2024-11-22 20:05:41 +08:00
PC-202302260912\Administrator 99514e3422 更换按钮 2024-11-18 17:06:17 +08:00
PC-202302260912\Administrator a3d665513b 修改字体颜色 2024-11-16 15:54:43 +08:00
zhangjiannan 5c9cd56597 1 2024-11-15 14:08:52 +08:00
zhangjiannan 84096616d2 修改挂机奖励按钮 2024-11-13 14:58:05 +08:00
PC-202302260912\Administrator 560050ddb2 1 2024-11-13 14:31:41 +08:00
zhangjiannan 699c903e8d 删除多余资源 2024-11-13 10:29:52 +08:00
zhangjiannan 1212678fdb 1 2024-11-12 18:01:23 +08:00
zhangjiannan caec443165 1 2024-11-12 16:57:51 +08:00
zhangjiannan a5f5894185 1 2024-11-12 16:22:23 +08:00
zhangjiannan 24acdc63bd 1 2024-11-12 15:30:54 +08:00
PC-202302260912\Administrator ce56acfe48 战斗报错修正 2024-11-08 19:14:38 +08:00
PC-202302260912\Administrator 3c5fca333e 漏传的lua 2024-11-08 13:02:13 +08:00
DESKTOP-RH64908\Administrator a384bda644 差异meta上传 2024-11-08 11:13:44 +08:00
PC-202302260912\Administrator fef7707cc1 周卡 2024-11-07 15:22:27 +08:00
zhangjiannan d34fc37a50 挂机角色压缩 2024-11-06 15:28:47 +08:00