|  ZhangBiao | 8ad3346af9 | 【特惠商城】 | 2021-12-17 16:05:51 +08:00 | 
				
					
						|  ZhangBiao | 0e732fa8b6 | 【新人商城】结束后关闭 | 2021-12-17 14:44:44 +08:00 | 
				
					
						|  ZhangBiao | 2eb83d4c63 | Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev | 2021-12-17 14:13:53 +08:00 | 
				
					
						|  ZhangBiao | d34d896f47 | 【成长礼包】提交 | 2021-12-17 14:13:41 +08:00 | 
				
					
						|  gaoxin | db2d3c8433 | Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev | 2021-12-27 14:01:06 +08:00 | 
				
					
						|  gaoxin | 1c9d3caa75 | 【罗浮】原罗浮商店跳转到逐胜商店 | 2021-12-27 14:00:47 +08:00 | 
				
					
						|  gaoxin | c393143cb6 | Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev | 2021-12-27 13:41:21 +08:00 | 
				
					
						|  gaoxin | d1ee1455eb | 【罗浮货币】跨服天梯 罗浮晶石1207->逐胜徽章24 | 2021-12-27 13:41:06 +08:00 | 
				
					
						|  gaoxin | 717e5f3411 | 【关卡】解锁提示按钮组件添加 | 2021-12-27 13:20:59 +08:00 | 
				
					
						|  gaoxin | 5bfb89d276 | 【关卡挂机】未解锁跳转功能添加 | 2021-12-27 13:11:33 +08:00 | 
				
					
						|  jiaoyangna | 1a8f01c2fd | Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev | 2021-12-17 14:12:13 +08:00 | 
				
					
						|  jiaoyangna | 94d2e1852f | 超值返利 | 2021-12-17 14:11:49 +08:00 | 
				
					
						|  jiaoyangna | 83b1fad0b7 | 跳转修改提交 | 2021-12-17 14:11:03 +08:00 | 
				
					
						|  ZhangBiao | d5ae25820d | Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev | 2021-12-17 14:00:15 +08:00 | 
				
					
						|  ZhangBiao | d939e6b32b | 【新人商城】提交 | 2021-12-17 14:00:07 +08:00 | 
				
					
						|  jiaoyangna | abb3c4ec5f | 跳转修改提交 | 2021-12-17 13:30:45 +08:00 | 
				
					
						|  jiaoyangna | 2f489fecad | Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev | 2021-12-17 13:29:24 +08:00 | 
				
					
						|  jiaoyangna | 4fdd4e7b62 | 跳转修改提交 | 2021-12-17 13:29:08 +08:00 | 
				
					
						|  ZhangBiao | f4b2a09f08 | 【商城界面】和信任商城 | 2021-12-17 12:08:15 +08:00 | 
				
					
						|  ZhangBiao | 17b286b890 | Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev | 2021-12-17 11:28:47 +08:00 | 
				
					
						|  ZhangBiao | 45241e1d5d | 【商城界面】提交 | 2021-12-17 11:28:37 +08:00 | 
				
					
						|  gaoxin | 7d02fd5394 | 【解锁提示】添加解锁条件显示 | 2021-12-27 09:58:34 +08:00 | 
				
					
						|  jiaoyangna | ab01f4ab25 | Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev | 2021-12-17 11:23:11 +08:00 | 
				
					
						|  jiaoyangna | ec53e8ad84 | 超值返利提交 | 2021-12-17 11:22:54 +08:00 | 
				
					
						|  ZhangBiao | e580889f3f | 【商城界面】无剩余次数修改 | 2021-12-17 09:56:48 +08:00 | 
				
					
						|  ZhangBiao | 052d7418ca | 【商城界面】提交 | 2021-12-17 09:31:45 +08:00 | 
				
					
						|  ZhangBiao | 2cb1af4c8b | Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev | 2021-12-16 19:22:57 +08:00 | 
				
					
						|  gaoxin | ab3d7e939b | 【解锁提示】添加功能解锁提示 | 2021-12-26 19:12:25 +08:00 | 
				
					
						|  ZhangBiao | 5393485f65 | 【商城界面】提交 | 2021-12-16 19:22:46 +08:00 | 
				
					
						|  jiaoyangna | 740aeac6bf | Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev | 2021-12-16 18:43:36 +08:00 | 
				
					
						|  gaoxin | f0d9f4828f | 【关卡新条件】条件显示在按钮上 | 2021-12-26 18:13:39 +08:00 | 
				
					
						|  skuld | 7476af5fd9 | bat Resource Commit:2021/12/18, 0:15:30 | 2021-12-18 00:15:31 +08:00 | 
				
					
						|  gaoxin | 26a1bc539d | Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev | 2021-12-26 17:36:04 +08:00 | 
				
					
						|  gaoxin | eaea265bc7 | 【物品】添加物品使用的限制等级 | 2021-12-26 17:35:50 +08:00 | 
				
					
						|  gaoxin | 22a1e695b9 | Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev | 2021-12-26 17:29:25 +08:00 | 
				
					
						|  gaoxin | acf5e8e31a | 【挂机物品】导致其他物品显示错误 | 2021-12-26 17:29:06 +08:00 | 
				
					
						|  gaoxin | cb8f8fe0aa | 【挂机物品】添加时间标签 | 2021-12-26 17:13:30 +08:00 | 
				
					
						|  jiaoyangna | 19a1e1b7ca | 超值返利提交 | 2021-12-16 18:41:30 +08:00 | 
				
					
						|  jiaoyangna | c1f0e0f78b | 添加选中框 | 2021-12-16 18:38:32 +08:00 | 
				
					
						|  ZhangBiao | 0aff8013ad | Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev | 2021-12-16 17:32:00 +08:00 | 
				
					
						|  ZhangBiao | ba86ead18b | 【资源】提交 | 2021-12-16 17:31:49 +08:00 | 
				
					
						|  ZhangBiao | b203711459 | Merge branch 'china/dev' into 0优化/商城界面 # Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset | 2021-12-16 17:17:16 +08:00 | 
				
					
						|  ZhangBiao | 3a96f7cf4e | 【商城界面】提交 | 2021-12-16 17:16:18 +08:00 | 
				
					
						|  ZhangBiao | c915a3b9eb | 【协议】提交 | 2021-12-16 17:00:47 +08:00 | 
				
					
						|  ZhangBiao | 68d6e39882 | 【协议】提交 | 2021-12-16 16:58:20 +08:00 | 
				
					
						|  jiaoyangna | 50927b9ac5 | Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev | 2021-12-16 16:55:46 +08:00 | 
				
					
						|  jiaoyangna | 1ae167efb5 | 至尊降世修改提交 | 2021-12-16 16:55:30 +08:00 | 
				
					
						|  wangzhenxing | 25bc46e049 | [战斗]======被动197    技能126  147修改 | 2021-12-16 16:13:01 +08:00 | 
				
					
						|  gaoxin | 969a22a768 | 【引导】修改引导天书密卷时主城场景的位置 | 2021-12-26 15:08:51 +08:00 | 
				
					
						|  ZhangBiao | ae3f0c5df2 | 【连续礼包】新增连续礼包入口 | 2021-12-16 14:20:04 +08:00 | 
				
					
						|  gaoxin | 7bf43f37f5 | 【挂机奖励】使用界面文字修改 | 2021-12-26 11:21:17 +08:00 | 
				
					
						|  ZhangBiao | abb068e9cb | 【商城界面】提交 | 2021-12-16 13:11:07 +08:00 | 
				
					
						|  ZhangBiao | e9954f49f2 | 【商城界面】提交 | 2021-12-16 11:59:18 +08:00 | 
				
					
						|  jiaoyangna | b811bd0d24 | 超值返利预设代码提交 | 2021-12-16 11:45:51 +08:00 | 
				
					
						|  jiaoyangna | a40a8a67d4 | Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev | 2021-12-16 11:42:37 +08:00 | 
				
					
						|  jiaoyangna | e2a1f147ae | 活动修改提交 | 2021-12-16 11:42:20 +08:00 | 
				
					
						|  jiaoyangna | 11c4f914b5 | 至尊降世提交 | 2021-12-16 11:42:00 +08:00 | 
				
					
						|  ZhangBiao | 2858f2e400 | 【商城界面】提交 | 2021-12-16 10:46:11 +08:00 | 
				
					
						|  wangzhenxing | d9f1670993 | 【战斗】====战斗gm报错修改 | 2021-12-16 10:24:36 +08:00 | 
				
					
						|  jiaoyangna | 7c1a3caa5f | Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev | 2021-12-16 10:10:05 +08:00 | 
				
					
						|  jiaoyangna | 73283bd818 | 回退修改提交 | 2021-12-16 10:09:48 +08:00 | 
				
					
						|  wangzhenxing | b46519d9c8 | 【战斗】=======反伤盾类型修改 | 2021-12-15 18:06:48 +08:00 | 
				
					
						|  wangzhenxing | 020d8b1b05 | [功能]=======战斗统计死亡单位置灰 | 2021-12-15 15:07:20 +08:00 | 
				
					
						|  jiaoyangna | c6eb719fa6 | 添加回退消耗数量 | 2021-12-15 14:41:04 +08:00 | 
				
					
						|  ZhangBiao | 0b190666d5 | 【商城界面】提交 | 2021-12-15 14:34:21 +08:00 | 
				
					
						|  jiaoyangna | 45be93ba03 | Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev | 2021-12-15 14:28:51 +08:00 | 
				
					
						|  jiaoyangna | 568ad92a9b | 回退修改 | 2021-12-15 14:28:36 +08:00 | 
				
					
						|  jiaoyangna | c5448299c0 | 报错修改提交 | 2021-12-15 13:35:44 +08:00 | 
				
					
						|  jiaoyangna | 4dc37c659c | 回退修改提交 | 2021-12-15 10:58:49 +08:00 | 
				
					
						|  jiaoyangna | 0d9a3cb8ed | Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev | 2021-12-15 10:28:43 +08:00 | 
				
					
						|  jiaoyangna | 2e2718d5bf | 预设修改提交 | 2021-12-15 10:28:26 +08:00 | 
				
					
						|  wangzhenxing | 9f2a977b07 | [功能]=========战斗统计界面添加死亡置灰 | 2021-12-15 09:44:35 +08:00 | 
				
					
						|  gaoxin | 8d644dd080 | Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev | 2021-12-25 07:58:52 +08:00 | 
				
					
						|  gaoxin | 973eee4b30 | 【物品】添加新物品类型 | 2021-12-25 07:58:30 +08:00 | 
				
					
						|  gaoxin | f22aa9fe80 | 【战斗】v1.0.74 1、修复RoleManager   table.removebyvalue方法空报错 | 2021-12-25 07:57:10 +08:00 | 
				
					
						|  gaoxin | d14c0fe589 | 【ID1010850】首充豪礼100元档去除 | 2021-12-24 17:49:17 +08:00 | 
				
					
						|  ZhangBiao | b07f3ce2d5 | 【商城界面】提交 | 2021-12-14 19:16:30 +08:00 | 
				
					
						|  jiaoyangna | 7e85eeaa90 | 【ID1010843】 增加英雄回退功能 | 2021-12-14 17:57:21 +08:00 | 
				
					
						|  jiaoyangna | 89a034a85e | Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev | 2021-12-14 17:26:02 +08:00 | 
				
					
						|  jiaoyangna | 0c83c3412e | 【ID1010843】 增加英雄回退功能 | 2021-12-14 17:25:44 +08:00 | 
				
					
						|  skuld | d8979d77bc | bat Resource Commit:2021/12/14,14:00:07 | 2021-12-14 14:00:07 +08:00 | 
				
					
						|  skuld | e85d95b008 | Revert "bat Resource Commit:2021/12/14,13:57:41" This reverts commit c246aa8095. | 2021-12-14 13:59:01 +08:00 | 
				
					
						|  skuld | c246aa8095 | bat Resource Commit:2021/12/14,13:57:41 | 2021-12-14 13:57:42 +08:00 | 
				
					
						|  gaoxin | 1691fd03da | 【战斗】优化身外化身casting显示时间 | 2021-12-14 13:51:41 +08:00 | 
				
					
						|  ZhangBiao | 31ce94705d | 【商城界面】资源提交 | 2021-12-14 13:15:20 +08:00 | 
				
					
						|  ZhangBiao | 887e444547 | 【新商城】提交 | 2021-12-14 11:18:25 +08:00 | 
				
					
						|  gaoxin | 82ced48859 | Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev | 2021-12-14 10:07:59 +08:00 | 
				
					
						|  gaoxin | 55f324445e | 【月卡】修复同时激活时提示文字错误 | 2021-12-14 10:07:42 +08:00 | 
				
					
						|  ZhangBiao | 4cb31b3ba0 | 【森罗幻境】修复英雄选框底图消失问题 | 2021-12-14 10:05:49 +08:00 | 
				
					
						|  jiaoyangna | 6a6f67d0ce | Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev | 2021-12-14 09:35:51 +08:00 | 
				
					
						|  jiaoyangna | 663957bbce | 去掉帮助按钮,修改文字 | 2021-12-14 09:35:35 +08:00 | 
				
					
						|  gaoxin | ab085087b0 | 【战斗】取消哪吒的技能后摇延时,可能会导致卡死 | 2021-12-13 18:56:49 +08:00 | 
				
					
						|  gaoxin | 3d19df7cb2 | 【关卡新条件】卸下再穿戴装备后关卡界面卡死 | 2021-12-13 18:43:27 +08:00 | 
				
					
						|  jiaoyangna | 386e56aec0 | Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev | 2021-12-13 17:44:29 +08:00 | 
				
					
						|  jiaoyangna | b4e7faa04c | 文字修改 | 2021-12-13 17:44:14 +08:00 | 
				
					
						|  wangzhenxing | 221f5cb13e | 【战斗】=====被动99  372  211  188被动添加空判断 | 2021-12-13 17:36:46 +08:00 | 
				
					
						|  gaoxin | a39a791f9f | Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev | 2021-12-13 17:30:00 +08:00 | 
				
					
						|  gaoxin | ba182c0671 | 【特效】女儿国王特效白片修复 | 2021-12-13 17:29:44 +08:00 | 
				
					
						|  jiaoyangna | abed1e0e9d | Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev | 2021-12-13 17:27:49 +08:00 | 
				
					
						|  jiaoyangna | bfd0cd7184 | 适配修改提交 | 2021-12-13 17:27:29 +08:00 |