PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								9f345ad331
								
							
								
							
						 | 
						
							
							
								
								优化页面修改一些bug
							
							
							
							
							
						 | 
						
							2025-07-18 18:35:01 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								dfb8e416db
								
							
								
							
						 | 
						
							
							
								
								优化页面背包和图鉴
							
							
							
							
							
						 | 
						
							2025-02-06 15:08:06 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								dc3d38364b
								
							
								
							
						 | 
						
							
							
								
								龙珠相关修改上传
							
							
							
							
							
						 | 
						
							2024-06-27 18:49:32 +08:00 | 
						
					
				
					
						
							
							
								
								 xiejun
							
						 | 
						
							
							
							
							
								
							
								610bcb4bf8
								
							
								
							
						 | 
						
							
							
								
								背包隐藏妖魂按钮
							
							
							
							
							
						 | 
						
							2024-01-22 19:35:49 +08:00 | 
						
					
				
					
						
							
							
								
								 wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								4f23b260da
								
							
								
							
						 | 
						
							
							
								
								背包神石分解界面
							
							
							
							
							
						 | 
						
							2024-01-17 15:48:24 +08:00 | 
						
					
				
					
						
							
							
								
								 wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								16ed97d86b
								
							
								
							
						 | 
						
							
							
								
								装备售卖界面修改提交
							
							
							
							
							
						 | 
						
							2024-01-15 15:10:19 +08:00 | 
						
					
				
					
						
							
							
								
								 xiejun
							
						 | 
						
							
							
							
							
								
							
								e1fa2f7aaa
								
							
								
							
						 | 
						
							
							
								
								背包修改
							
							
							
							
							
						 | 
						
							2024-01-04 18:12:59 +08:00 | 
						
					
				
					
						
							
							
								
								 wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								030431e3fc
								
							
								
							
						 | 
						
							
							
								
								合并0.1新功能修改
							
							
							
							
							
						 | 
						
							2024-01-03 15:24:49 +08:00 | 
						
					
				
					
						
							
							
								
								 wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								ff42f1ad59
								
							
								
							
						 | 
						
							
							
								
								神印修改提交
							
							
							
							
							
						 | 
						
							2024-01-02 16:58:06 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								8d2c728a84
								
							
								
							
						 | 
						
							
							
								
								奖励物品展示修改提交
							
							
							
							
							
							
							
							(cherry picked from commit bc3f82e874) 
							
						 | 
						
							2023-12-06 15:20:01 +08:00 | 
						
					
				
					
						
							
							
								
								 xiejun
							
						 | 
						
							
							
							
							
								
							
								4e6e0f29bd
								
							
								
							
						 | 
						
							
							
								
								角色特训
							
							
							
							
							
						 | 
						
							2023-11-28 21:31:01 +08:00 | 
						
					
				
					
						
							
							
								
								 wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								ed63b42413
								
							
								
							
						 | 
						
							
							
								
								法宝聚灵修改提交
							
							
							
							
							
						 | 
						
							2023-10-30 15:27:42 +08:00 | 
						
					
				
					
						
							
							
								
								 wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								9c1823a57b
								
							
								
							
						 | 
						
							
							
								
								装备抽卡修改提交
							
							
							
							
							
						 | 
						
							2023-10-27 20:58:24 +08:00 | 
						
					
				
					
						
							
							
								
								 wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								ed4865cc3c
								
							
								
							
						 | 
						
							
							
								
								法宝星级显示修改
							
							
							
							
							
						 | 
						
							2023-10-26 20:44:18 +08:00 | 
						
					
				
					
						
							
							
								
								 wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								0d08ea1a84
								
							
								
							
						 | 
						
							
							
								
								法灵提交
							
							
							
							
							
						 | 
						
							2023-10-26 17:16:10 +08:00 | 
						
					
				
					
						
							
							
								
								 wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								bb18772265
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_oneDis' into onepiece_demo
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua 
							
						 | 
						
							2023-09-21 18:43:54 +08:00 | 
						
					
				
					
						
							
							
								
								 xiejun
							
						 | 
						
							
							
							
							
								
							
								c47462c5d8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_one_discount' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo
							
							
							
							
							
							
							
							# Conflicts:
#	AssetBundles/version.txt
#	Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua
#	Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelChapterPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua 
							
						 | 
						
							2023-09-20 18:57:44 +08:00 | 
						
					
				
					
						
							
							
								
								 wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								b8a15b703b
								
							
								
							
						 | 
						
							
							
								
								礼物特效层级修改提交
							
							
							
							
							
						 | 
						
							2023-09-20 16:33:01 +08:00 | 
						
					
				
					
						
							
							
								
								 wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								c39a4e1fcc
								
							
								
							
						 | 
						
							
							
								
								命石修改提交
							
							
							
							
							
						 | 
						
							2023-09-01 23:41:45 +08:00 | 
						
					
				
					
						
							
							
								
								 wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								ffaab0f625
								
							
								
							
						 | 
						
							
							
								
								命石飘战力提交
							
							
							
							
							
						 | 
						
							2023-09-01 18:29:25 +08:00 | 
						
					
				
					
						
							
							
								
								 wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								2b93776f7c
								
							
								
							
						 | 
						
							
							
								
								命格修改提交
							
							
							
							
							
						 | 
						
							2023-09-01 17:36:15 +08:00 | 
						
					
				
					
						
							
							
								
								 wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								52393c592c
								
							
								
							
						 | 
						
							
							
								
								命石提交
							
							
							
							
							
						 | 
						
							2023-08-31 15:02:13 +08:00 | 
						
					
				
					
						
							
							
								
								 xiejun
							
						 | 
						
							
							
							
							
								
							
								6ced2b0507
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_oneDis' into onepiece_demo
							
							
							
							
							
							
							
							# Conflicts:
#	AssetBundles/version.txt
#	Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua 
							
						 | 
						
							2023-08-29 17:58:24 +08:00 | 
						
					
				
					
						
							
							
								
								 xiejun
							
						 | 
						
							
							
							
							
								
							
								fd8329bf90
								
							
								
							
						 | 
						
							
							
								
								海贼UI
							
							
							
							
							
						 | 
						
							2023-07-27 18:37:04 +08:00 | 
						
					
				
					
						
							
							
								
								 xiejun
							
						 | 
						
							
							
							
							
								
							
								8a4e15e258
								
							
								
							
						 | 
						
							
							
								
								海贼UI替换
							
							
							
							
							
						 | 
						
							2023-07-21 17:04:16 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								49958d7b10
								
							
								
							
						 | 
						
							
							
								
								背包==================屏蔽魂印,变身,聚灵按钮
							
							
							
							
							
						 | 
						
							2023-07-13 17:01:05 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								b22a8d6975
								
							
								
							
						 | 
						
							
							
								
								新手开启新手引导
							
							
							
							
							
						 | 
						
							2023-06-12 14:31:23 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								1f94c3d234
								
							
								
							
						 | 
						
							
							
								
								变身卡添加职业
							
							
							
							
							
						 | 
						
							2023-04-21 13:24:26 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								3f8a00cb14
								
							
								
							
						 | 
						
							
							
								
								[神兵]==================修改提交
							
							
							
							
							
						 | 
						
							2023-04-11 14:41:36 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								12e2cecaa1
								
							
								
							
						 | 
						
							
							
								
								神兵属性,神兵羁绊,神兵分解提交
							
							
							
							
							
						 | 
						
							2023-04-04 11:15:32 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								826f58ce6e
								
							
								
							
						 | 
						
							
							
								
								神兵提交
							
							
							
							
							
						 | 
						
							2023-03-28 13:57:59 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								b1e56c1280
								
							
								
							
						 | 
						
							
							
								
								获取宝物法相展示修改提交
							
							
							
							
							
						 | 
						
							2023-02-21 15:25:14 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								7f20d17b42
								
							
								
							
						 | 
						
							
							
								
								法相背包显示修改
							
							
							
							
							
						 | 
						
							2023-02-20 17:58:28 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								9fecd102e9
								
							
								
							
						 | 
						
							
							
								
								法相背包显示修改
							
							
							
							
							
						 | 
						
							2023-02-20 10:59:12 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								726b53355e
								
							
								
							
						 | 
						
							
							
								
								法相背包修改提交
							
							
							
							
							
						 | 
						
							2023-02-19 21:21:45 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								c2f2f9255b
								
							
								
							
						 | 
						
							
							
								
								法相修改提交
							
							
							
							
							
						 | 
						
							2023-02-18 15:52:52 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								0b6d8ab978
								
							
								
							
						 | 
						
							
							
								
								法相提交
							
							
							
							
							
						 | 
						
							2023-02-17 19:43:00 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								3a4a24c725
								
							
								
							
						 | 
						
							
							
								
								英雄升级资源包添加排序
							
							
							
							
							
						 | 
						
							2022-11-15 16:16:43 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								3a952c6753
								
							
								
							
						 | 
						
							
							
								
								英雄培养优化
							
							
							
							
							
						 | 
						
							2022-11-15 15:57:48 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								d11e4a90cc
								
							
								
							
						 | 
						
							
							
								
								英雄升级突破材料不足提示
							
							
							
							
							
						 | 
						
							2022-11-04 16:28:16 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								ddc23a9319
								
							
								
							
						 | 
						
							
							
								
								[gm]======背包使用添加类型
							
							
							
							
							
						 | 
						
							2022-11-01 10:09:17 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								a0e830b025
								
							
								
							
						 | 
						
							
							
								
								[bt]======变身卡碎片显示修改
							
							
							
							
							
						 | 
						
							2022-10-21 10:25:10 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								8d63d391a6
								
							
								
							
						 | 
						
							
							
								
								[gm]==============声望特权提交
							
							
							
							
							
						 | 
						
							2022-10-20 17:48:00 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								f1c0a2fcd8
								
							
								
							
						 | 
						
							
							
								
								[背包]====直冲卡添加使用
							
							
							
							
							
						 | 
						
							2022-09-23 15:50:28 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								efe732d91d
								
							
								
							
						 | 
						
							
							
								
								[gm]=============刷冲特权提交
							
							
							
							
							
						 | 
						
							2022-09-23 15:24:10 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								fdaec2ac28
								
							
								
							
						 | 
						
							
							
								
								[gm修改器]=====提交
							
							
							
							
							
						 | 
						
							2022-09-20 17:04:48 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								e3f58fbbec
								
							
								
							
						 | 
						
							
							
								
								物品神应等级显示
							
							
							
							
							
						 | 
						
							2022-09-07 15:25:36 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								44787f9e58
								
							
								
							
						 | 
						
							
							
								
								[背包]======背包提交法宝页签
							
							
							
							
							
						 | 
						
							2022-08-30 18:10:07 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								ceefbf5c42
								
							
								
							
						 | 
						
							
							
								
								[背包]=====碎片合成按钮显示修改
							
							
							
							
							
						 | 
						
							2022-08-17 17:25:45 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								4d59e2b852
								
							
								
							
						 | 
						
							
							
								
								[背包]====装备碎片显示修改
							
							
							
							
							
						 | 
						
							2022-08-16 16:36:09 +08:00 |