PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								b22464bb4e
								
							
								
							
						 | 
						
							
							
								
								按钮图片修改
							
							
							
							
							
						 | 
						
							2025-08-18 18:45:01 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								474bc21dba
								
							
								
							
						 | 
						
							
							
								
								修改预设
							
							
							
							
							
						 | 
						
							2025-08-18 17:49:48 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								1a5657fe47
								
							
								
							
						 | 
						
							
							
								
								调整图片
							
							
							
							
							
						 | 
						
							2025-08-18 17:15:55 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								2cecece74d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu
							
							
							
							
							
						 | 
						
							2025-08-18 15:06:13 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								62f28c20ee
								
							
								
							
						 | 
						
							
							
								
								修正预设
							
							
							
							
							
						 | 
						
							2025-08-18 15:05:52 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-RH64908\Administrator
							
						 | 
						
							
							
							
							
								
							
								111b16cf1b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu
							
							
							
							
							
						 | 
						
							2025-08-18 15:00:54 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-RH64908\Administrator
							
						 | 
						
							
							
							
							
								
							
								9be5940718
								
							
								
							
						 | 
						
							
							
								
								1
							
							
							
							
							
						 | 
						
							2025-08-18 15:00:33 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								652bdcb3e8
								
							
								
							
						 | 
						
							
							
								
								1
							
							
							
							
							
						 | 
						
							2025-08-18 14:42:48 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								5e316c3c9e
								
							
								
							
						 | 
						
							
							
								
								优化竞技场页面
							
							
							
							
							
						 | 
						
							2025-08-16 17:04:05 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								12693c3289
								
							
								
							
						 | 
						
							
							
								
								优化饰品强化页面
							
							
							
							
							
						 | 
						
							2025-08-16 16:50:58 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								6feb5bab7a
								
							
								
							
						 | 
						
							
							
								
								修改预设
							
							
							
							
							
						 | 
						
							2025-08-15 19:09:58 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								a0045f8d23
								
							
								
							
						 | 
						
							
							
								
								1
							
							
							
							
							
						 | 
						
							2025-08-15 17:58:03 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								6175b80a53
								
							
								
							
						 | 
						
							
							
								
								跳转和部分页面优化
							
							
							
							
							
						 | 
						
							2025-08-15 16:42:33 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								a0eabe4fe5
								
							
								
							
						 | 
						
							
							
								
								神龙去掉消耗材料
							
							
							
							
							
						 | 
						
							2025-08-15 16:38:36 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								7819491cc4
								
							
								
							
						 | 
						
							
							
								
								宇宙晶石
							
							
							
							
							
						 | 
						
							2025-08-15 15:31:19 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								fc9519d55f
								
							
								
							
						 | 
						
							
							
								
								宇宙晶石
							
							
							
							
							
						 | 
						
							2025-08-15 15:25:17 +08:00 | 
						
					
				
					
						
							
							
								
								 DESKTOP-MMO982B\User
							
						 | 
						
							
							
							
							
								
							
								550601deda
								
							
								
							
						 | 
						
							
							
								
								1
							
							
							
							
							
						 | 
						
							2025-08-15 12:43:05 +08:00 | 
						
					
				
					
						
							
							
								
								 DESKTOP-MMO982B\User
							
						 | 
						
							
							
							
							
								
							
								6a86f82352
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua 
							
						 | 
						
							2025-08-15 12:42:40 +08:00 | 
						
					
				
					
						
							
							
								
								 DESKTOP-MMO982B\User
							
						 | 
						
							
							
							
							
								
							
								a912edd632
								
							
								
							
						 | 
						
							
							
								
								1
							
							
							
							
							
						 | 
						
							2025-08-15 12:40:21 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								7103d04a8f
								
							
								
							
						 | 
						
							
							
								
								芯片升级道具修改
							
							
							
							
							
						 | 
						
							2025-08-15 11:53:41 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-RH64908\Administrator
							
						 | 
						
							
							
							
							
								
							
								674f2c502e
								
							
								
							
						 | 
						
							
							
								
								物品详情界面顶部品质颜色固定为蓝色
							
							
							
							
							
						 | 
						
							2025-08-15 10:42:46 +08:00 | 
						
					
				
					
						
							
							
								
								 DESKTOP-MMO982B\User
							
						 | 
						
							
							
							
							
								
							
								13476aa8dd
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu
							
							
							
							
							
						 | 
						
							2025-08-14 17:39:36 +08:00 | 
						
					
				
					
						
							
							
								
								 DESKTOP-MMO982B\User
							
						 | 
						
							
							
							
							
								
							
								7ad1a2299e
								
							
								
							
						 | 
						
							
							
								
								1
							
							
							
							
							
						 | 
						
							2025-08-14 17:39:26 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								14a5f96020
								
							
								
							
						 | 
						
							
							
								
								七界相关页面优化
							
							
							
							
							
						 | 
						
							2025-08-14 15:05:13 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								add1c4ef60
								
							
								
							
						 | 
						
							
							
								
								屏蔽七界商店
							
							
							
							
							
						 | 
						
							2025-08-14 14:53:17 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								00407220d8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu
							
							
							
							
							
						 | 
						
							2025-08-14 13:21:02 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								4927252575
								
							
								
							
						 | 
						
							
							
								
								优化页面批量上传
							
							
							
							
							
						 | 
						
							2025-08-14 13:20:39 +08:00 | 
						
					
				
					
						
							
							
								
								 DESKTOP-MMO982B\User
							
						 | 
						
							
							
							
							
								
							
								235f4bb07c
								
							
								
							
						 | 
						
							
							
								
								1
							
							
							
							
							
						 | 
						
							2025-08-14 11:23:48 +08:00 | 
						
					
				
					
						
							
							
								
								 DESKTOP-MMO982B\User
							
						 | 
						
							
							
							
							
								
							
								e79b46200a
								
							
								
							
						 | 
						
							
							
								
								每分钟改成每半小时
							
							
							
							
							
						 | 
						
							2025-08-14 11:23:25 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								73e25f6969
								
							
								
							
						 | 
						
							
							
								
								图鉴内生命卡改成意念
							
							
							
							
							
						 | 
						
							2025-08-13 20:16:19 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								11e3622161
								
							
								
							
						 | 
						
							
							
								
								1
							
							
							
							
							
						 | 
						
							2025-08-13 19:48:17 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								af71c426a8
								
							
								
							
						 | 
						
							
							
								
								去掉命格描述
							
							
							
							
							
						 | 
						
							2025-08-13 19:47:06 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								b8b7fc92de
								
							
								
							
						 | 
						
							
							
								
								意念列表修改
							
							
							
							
							
						 | 
						
							2025-08-13 19:14:19 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								5db11d97c8
								
							
								
							
						 | 
						
							
							
								
								1
							
							
							
							
							
						 | 
						
							2025-08-13 18:50:42 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								a3efb9f0af
								
							
								
							
						 | 
						
							
							
								
								心愿限制显示从5级改成抽卡100次
							
							
							
							
							
						 | 
						
							2025-08-13 18:43:45 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								6e873841ac
								
							
								
							
						 | 
						
							
							
								
								优化页面
							
							
							
							
							
						 | 
						
							2025-08-13 18:10:56 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								abb7aa4c19
								
							
								
							
						 | 
						
							
							
								
								妖晶替换为钻石
							
							
							
							
							
						 | 
						
							2025-08-13 18:09:55 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								a2fdb6f9da
								
							
								
							
						 | 
						
							
							
								
								妖晶召唤次数改为钻石
							
							
							
							
							
						 | 
						
							2025-08-13 18:03:00 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								f7142faa7a
								
							
								
							
						 | 
						
							
							
								
								特训地图上传
							
							
							
							
							
						 | 
						
							2025-08-13 17:59:56 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								f841042860
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu
							
							
							
							
							
						 | 
						
							2025-08-13 17:59:20 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								629704cbf6
								
							
								
							
						 | 
						
							
							
								
								特训相关建筑上传
							
							
							
							
							
						 | 
						
							2025-08-13 17:59:04 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-RH64908\Administrator
							
						 | 
						
							
							
							
							
								
							
								3bc7cdfee5
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu
							
							
							
							
							
						 | 
						
							2025-08-13 15:48:57 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-RH64908\Administrator
							
						 | 
						
							
							
							
							
								
							
								cf288e1915
								
							
								
							
						 | 
						
							
							
								
								1
							
							
							
							
							
						 | 
						
							2025-08-13 15:47:23 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								72ed670558
								
							
								
							
						 | 
						
							
							
								
								超值连冲三十档位开启
							
							
							
							
							
						 | 
						
							2025-08-13 15:28:11 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								0a80bf8b15
								
							
								
							
						 | 
						
							
							
								
								优化页面意念
							
							
							
							
							
						 | 
						
							2025-08-13 13:55:48 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								c0407819bf
								
							
								
							
						 | 
						
							
							
								
								1
							
							
							
							
							
						 | 
						
							2025-08-13 09:45:35 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								5bee08b4d6
								
							
								
							
						 | 
						
							
							
								
								抽卡页面
							
							
							
							
							
						 | 
						
							2025-08-12 20:46:04 +08:00 | 
						
					
				
					
						
							
							
								
								 DESKTOP-MMO982B\User
							
						 | 
						
							
							
							
							
								
							
								e3e9640097
								
							
								
							
						 | 
						
							
							
								
								1
							
							
							
							
							
						 | 
						
							2025-08-12 14:28:17 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								ea27349624
								
							
								
							
						 | 
						
							
							
								
								优化四个页面
							
							
							
							
							
						 | 
						
							2025-08-12 13:51:07 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								e76b33ef3b
								
							
								
							
						 | 
						
							
							
								
								修改神器页面
							
							
							
							
							
						 | 
						
							2025-08-11 20:45:10 +08:00 |