|  xiejun | a959169f6f | 修行界面奖励预览ui更换 | 2023-12-04 16:10:10 +08:00 | 
				
					
						|  wangzhenxing | f3c0f99d74 | 英雄进阶预览修改提交 | 2023-12-04 11:34:41 +08:00 | 
				
					
						|  wangzhenxing | 04fc9b9f3e | 山河社稷图突破修改提交 | 2023-12-04 10:52:10 +08:00 | 
				
					
						|  PC-202302260912\Administrator | 2ca4403747 | 优化页面 | 2023-11-20 16:59:48 +08:00 | 
				
					
						|  wangzhenxing | 344e68ff63 | 预设修改提交 | 2023-11-15 14:25:44 +08:00 | 
				
					
						|  wangzhenxing | 1ca943c83e | 神将热榜界面修改 | 2023-11-13 15:45:17 +08:00 | 
				
					
						|  wangzhenxing | 8da4412a87 | 主城预设 修改提交 | 2023-11-08 13:55:38 +08:00 | 
				
					
						|  PC-202302260912\Administrator | 92697e036c | 通用页面上传 | 2023-11-06 15:21:57 +08:00 | 
				
					
						|  PC-202302260912\Administrator | 7bb9276a39 | 优化抽卡页面 | 2023-11-03 19:19:38 +08:00 | 
				
					
						|  PC-202302260912\Administrator | 42c6da7293 | 优化境界预览 | 2023-11-03 18:18:14 +08:00 | 
				
					
						|  PC-202302260912\Administrator | fb1855b590 | 修改境界预览 | 2023-11-03 17:57:54 +08:00 | 
				
					
						|  wangzhenxing | dbac53d14d | 属性信息界面,技能信息界面修改 | 2023-11-01 15:47:17 +08:00 | 
				
					
						|  xiejun | 663fbca133 | 神兵热榜 | 2023-10-24 20:02:38 +08:00 | 
				
					
						|  xiejun | 100980e98b | 删除老预制体 | 2023-10-23 17:51:23 +08:00 | 
				
					
						|  xiejun | 88740201b3 | 排行榜UI | 2023-09-20 18:00:40 +08:00 | 
				
					
						|  xiejun | af6b341a0c | 修改子弹逻辑 | 2023-09-18 15:41:32 +08:00 | 
				
					
						|  xiejun | 83a8e9ab56 | 修改 | 2023-09-01 18:27:39 +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 | 148443883c | 神将 | 2023-08-11 19:03:48 +08:00 | 
				
					
						|  wangzhenxing | 14e16c3d34 | 心愿法宝弹窗修改 | 2023-06-06 16:50:56 +08:00 | 
				
					
						|  wangzhenxing | ebfddaad60 | 法宝心愿修改提交 | 2023-06-06 15:57:53 +08:00 | 
				
					
						|  wangzhenxing | ac172339ae | 心愿抽卡修改提交 | 2023-05-27 19:04:30 +08:00 | 
				
					
						|  wangzhenxing | 7758ec6d8d | 法宝自选箱,宝物添加时空选项 | 2023-04-21 10:50:09 +08:00 | 
				
					
						|  wangzhenxing | 37b9fa3b7b | 英雄热榜预设修改 | 2022-12-13 18:10:28 +08:00 | 
				
					
						|  wangzhenxing | 7109e86706 | 英雄热榜提交 | 2022-12-13 16:06:12 +08:00 | 
				
					
						|  dengdan | dcff772716 | 修改部分系统的按钮样式 | 2022-11-30 21:51:06 +08:00 | 
				
					
						|  wangzhenxing | 19ce8e51d5 | 英雄升星扩展 | 2022-11-03 14:33:09 +08:00 | 
				
					
						|  wangzhenxing | 5a1440cd69 | [全民福利]=====提交 | 2022-09-15 16:48:56 +08:00 | 
				
					
						|  wangzhenxing | 66664bd3e2 | [心愿抽卡]=======预设修改提交 | 2022-07-12 14:26:32 +08:00 | 
				
					
						|  wangzhenxing | 396ca1a425 | [洞府]=======洞府特权修改 | 2022-06-10 14:42:35 +08:00 | 
				
					
						|  wangzhenxing | e509483e41 | [寻仙招募]=====预设修改 | 2022-05-23 15:30:58 +08:00 | 
				
					
						|  luyao | 25ee0998e7 | 一键探索 按钮背景更换 | 2022-04-28 20:05:23 +08:00 | 
				
					
						|  luyao | e810e85e5e | 洞府界面。升级按钮 背景修改 | 2022-04-28 19:35:57 +08:00 | 
				
					
						|  wangzhenxing | 81122369c6 | bug修改提交 | 2022-04-26 16:09:21 +08:00 | 
				
					
						|  wangzhenxing | 7cdf302e90 | 神印修改提交 | 2022-04-24 14:20:11 +08:00 | 
				
					
						|  wangzhenxing | df42d22d4c | 公用背景预设修改提交 | 2022-04-22 14:07:30 +08:00 | 
				
					
						|  wangzhenxing | e4de85a120 | tips背景修改,公用弹窗背景显示修改 | 2022-04-22 13:09:45 +08:00 | 
				
					
						|  wangzhenxing | 9999138d97 | [资源]=======新提示背景框提交 | 2022-04-21 13:41:59 +08:00 | 
				
					
						|  wangzhenxing | 4bb0977391 | [bug]=======bug修改预设提交 | 2022-04-02 14:33:08 +08:00 | 
				
					
						|  wangzhenxing | eff2800c35 | Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev | 2022-03-31 09:51:26 +08:00 | 
				
					
						|  wangzhenxing | 57812ad22f | [功能]=======命石修改,建木神树修改 | 2022-03-29 15:28:56 +08:00 | 
				
					
						|  wangzhenxing | a13dd2939a | [功能]================神系英雄添加提叫 | 2022-03-28 18:18:19 +08:00 | 
				
					
						|  wangzhenxing | 7de5fdac9e | [飞升]=====特效问题修改 | 2022-01-20 17:58:57 +08:00 | 
				
					
						|  wangzhenxing | 109648ae93 | Merge branch 'china/dev' into china/飞升 | 2022-01-19 16:13:20 +08:00 | 
				
					
						|  jiaoyangna | 76295739f3 | 【ID1019513】 【品质调整】神将技能弹窗,不关闭也可以点返回 | 2022-01-18 15:01:01 +08:00 | 
				
					
						|  ZhangBiao | 54aeaa2ea8 | 【寻仙招募】提交 | 2022-01-18 12:09:43 +08:00 | 
				
					
						|  wangzhenxing | ef0a0ff436 | Merge branch 'china/dev' into china/飞升 Conflicts:
	Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
	Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
	Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroAndEquipListPanel.prefab
	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
	Assets/ManagedResources/~Lua/Data/UIData.lua
	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
	Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua
	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua | 2022-01-15 12:47:22 +08:00 | 
				
					
						|  ZhangBiao | cbea9006b3 | 【家园】资源替换 | 2022-01-14 17:38:46 +08:00 | 
				
					
						|  jiaoyangna | 3f267894a8 | 神将修改提交 | 2022-01-14 16:14:52 +08:00 | 
				
					
						|  ZhangBiao | 48901f3817 | 【寻仙招募】心愿单中添加飞升石道具 | 2022-01-12 18:27:16 +08:00 |