Commit Graph

15426 Commits (0b36cb272db87cbc3415c95392ded3a9690f4ab8)
 

Author SHA1 Message Date
DESKTOP-MMO982B\User 1aef223b7b Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu
# Conflicts:
#	Assets/ManagedResources/Prefabs/Live2d/10002jn_gx.prefab
#	Assets/ManagedResources/Prefabs/Live2d/10002jn_gx.prefab.meta
#	Assets/ManagedResources/Prefabs/Live2d/10003jn_gx.prefab
#	Assets/ManagedResources/Prefabs/Live2d/10003jn_gx.prefab.meta
#	Assets/ManagedResources/Prefabs/Live2d/10004jn_gx.prefab
#	Assets/ManagedResources/Prefabs/Live2d/10004jn_gx.prefab.meta
#	Assets/ManagedResources/Spine/10004jn_gx.meta
#	Assets/ManagedResources/Spine/10004jn_gx/10004jn_gx.atlas.txt.meta
#	Assets/ManagedResources/Spine/10004jn_gx/10004jn_gx.png.meta
#	Assets/ManagedResources/Spine/10004jn_gx/10004jn_gx.skel.bytes.meta
#	Assets/ManagedResources/Spine/10004jn_gx/10004jn_gx_Atlas.asset
#	Assets/ManagedResources/Spine/10004jn_gx/10004jn_gx_Atlas.asset.meta
#	Assets/ManagedResources/Spine/10004jn_gx/10004jn_gx_Material.mat
#	Assets/ManagedResources/Spine/10004jn_gx/10004jn_gx_Material.mat.meta
#	Assets/ManagedResources/Spine/10004jn_gx/10004jn_gx_SkeletonData.asset
#	Assets/ManagedResources/Spine/10004jn_gx/10004jn_gx_SkeletonData.asset.meta
2024-08-27 11:13:18 +08:00
DESKTOP-MMO982B\User 6368dd1dec 技能 2024-08-27 11:07:44 +08:00
PC-202302260912\Administrator 47b7c25c3c 模型相关 2024-08-19 19:41:58 +08:00
PC-202302260912\Administrator dc49c9bc12 龙珠所有模型图片 2024-08-19 19:37:21 +08:00
PC-202302260912\Administrator 1fa1310e79 我方释放技能修改 2024-08-19 16:39:18 +08:00
PC-202302260912\Administrator 24dd64fbc0 公会页面 2024-08-16 18:50:42 +08:00
PC-202302260912\Administrator 3d04605afa 在线奖励 2024-08-16 18:14:13 +08:00
PC-202302260912\Administrator a456501303 潜能页面 2024-08-16 17:35:57 +08:00
PC-202302260912\Administrator ceed58d7df UI背包 2024-08-15 11:16:37 +08:00
PC-202302260912\Administrator 1bdecf2432 连够 2024-07-24 19:20:51 +08:00
PC-202302260912\Administrator 4664a9b723 寻宝页面 2024-07-24 19:17:18 +08:00
PC-202302260912\Administrator 2a6d0e2227 超级特权野蛮 2024-07-24 19:15:12 +08:00
PC-202302260912\Administrator af56af63a3 GM修改器 2024-07-24 17:41:54 +08:00
PC-202302260912\Administrator 397191282d 成长基金 2024-07-24 17:06:38 +08:00
wangzhenxing 1e1b819b78 战斗力修改 2024-07-24 16:52:03 +08:00
PC-202302260912\Administrator d25cab0c5f 特惠页面修改 2024-07-24 15:11:44 +08:00
PC-202302260912\Administrator c6ef92b839 添加漏传图片 2024-07-24 15:06:01 +08:00
PC-202302260912\Administrator 263daa0cb5 添加图片 2024-07-24 15:01:53 +08:00
PC-202302260912\Administrator 4cf67a533c 狂欢大礼活动上传 2024-07-24 14:34:21 +08:00
PC-202302260912\Administrator 85b35835b2 公会援助 2024-07-24 13:46:36 +08:00
PC-202302260912\Administrator ed48189615 秘宝之地图片上传 2024-07-24 11:32:56 +08:00
PC-202302260912\Administrator cb9803057b 关卡界面优化 2024-07-17 18:22:41 +08:00
PC-202302260912\Administrator d191963c03 优化页面 2024-07-31 18:59:25 +08:00
PC-202302260912\Administrator 6907766d23 英雄页面修改 2024-07-16 16:20:02 +08:00
PC-202302260912\Administrator 7f5066dc24 图鉴页面 2024-07-16 15:54:18 +08:00
PC-202302260912\Administrator aaad804379 图鉴修改 2024-07-16 15:49:40 +08:00
PC-202302260912\Administrator 4420cdcd19 编队页面修改 2024-07-16 15:23:53 +08:00
PC-202302260912\Administrator b83dafe79e 海上夺宝地图 2024-07-16 14:26:15 +08:00
PC-202302260912\Administrator c197a4289a 命格按钮上传 2024-07-16 14:18:01 +08:00
PC-202302260912\Administrator 0139310d9f 主页面图标修改 2024-07-16 13:59:40 +08:00
PC-202302260912\Administrator 5e360b2dfb 命格等级页面修改 2024-07-16 13:46:40 +08:00
PC-202302260912\Administrator 597b11d38b 修改loading图 2024-07-16 13:28:58 +08:00
PC-202302260912\Administrator f213167d0b 宇宙武道会 2024-07-16 13:08:17 +08:00
PC-202302260912\Administrator 3bcd61dae8 轩辕相关 2024-07-16 11:47:47 +08:00
PC-202302260912\Administrator 33d3112995 轩辕相关 2024-07-16 11:45:25 +08:00
PC-202302260912\Administrator 5f72b6bf3a 军团副本 2024-07-16 11:00:19 +08:00
PC-202302260912\Administrator 4fed6fcbad 遗漏图片上传 2024-07-16 10:53:14 +08:00
PC-202302260912\Administrator 3f042895f6 英雄试炼修改 2024-07-15 14:36:21 +08:00
PC-202302260912\Administrator 4231f34d10 英雄试炼 2024-07-15 14:24:34 +08:00
PC-202302260912\Administrator 5c331cc0cb 竞技场页面优化 2024-07-15 14:14:35 +08:00
PC-202302260912\Administrator 815723620c 遗漏的图片上传 2024-07-15 14:04:55 +08:00
PC-202302260912\Administrator 76a2ce60ac 竞技场主页面修改 2024-07-15 13:53:52 +08:00
DESKTOP-MMO982B\User 9871fa08db 适配 2024-07-12 16:43:06 +08:00
DESKTOP-MMO982B\User fc655baf56 适配 2024-07-12 14:16:31 +08:00
PC-202302260912\Administrator 32e2e72b61 竞技场礼包 2024-07-11 19:25:44 +08:00
PC-202302260912\Administrator 5217fa3ce0 竞技场页面修改 2024-07-11 19:24:06 +08:00
PC-202302260912\Administrator 25a373a342 天数密卷 2024-07-11 17:52:07 +08:00
PC-202302260912\Administrator 0f49ededfe 限时修改 2024-07-11 17:42:51 +08:00
PC-202302260912\Administrator ed58283085 抽卡相关 2024-07-11 17:39:49 +08:00
PC-202302260912\Administrator ae754a1cd6 超值连冲 2024-07-11 16:44:31 +08:00