jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								ffdb9c20eb
								
							
								
							
						 | 
						
							
							
								
								图片提交
							
							
							
							
							
						 | 
						
							2020-11-19 18:31:11 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								3e7c24c029
								
							
								
							
						 | 
						
							
							
								
								【主题活动】降龙伏虎
							
							
							
							
							
						 | 
						
							2020-11-18 18:15:50 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								44a1d94860
								
							
								
							
						 | 
						
							
							
								
								神医天降修改
							
							
							
							
							
						 | 
						
							2020-11-13 15:47:04 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								21988be4e2
								
							
								
							
						 | 
						
							
							
								
								【觉醒】 觉醒成功替换资源
							
							
							
							
							
						 | 
						
							2020-11-13 11:18:46 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								e9d984b329
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' into 0功能/神将觉醒
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua 
							
						 | 
						
							2020-11-12 19:34:29 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								8b15fe28eb
								
							
								
							
						 | 
						
							
							
								
								【献祭坛】11.5 资源提换
							
							
							
							
							
						 | 
						
							2020-11-12 18:12:02 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								2c143deea9
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0活动开发聚集地/灵兽抽卡' into master_xma_local
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua 
							
						 | 
						
							2020-11-12 17:21:42 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								b1128dd88e
								
							
								
							
						 | 
						
							
							
								
								【献祭坛】适配调试
							
							
							
							
							
						 | 
						
							2020-11-12 17:05:34 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								358ecb8166
								
							
								
							
						 | 
						
							
							
								
								[玄机妙算] 提交
							
							
							
							
							
						 | 
						
							2020-11-12 15:10:52 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								a6483b3181
								
							
								
							
						 | 
						
							
							
								
								[灵兽特惠] 提交
							
							
							
							
							
						 | 
						
							2020-11-12 11:31:33 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								0ca5e4ea13
								
							
								
							
						 | 
						
							
							
								
								【觉醒】bug
							
							
							
							
							
						 | 
						
							2020-11-11 20:21:37 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								48e6d33b7b
								
							
								
							
						 | 
						
							
							
								
								【神将觉醒】 效果图 资源 提交
							
							
							
							
							
						 | 
						
							2020-11-10 17:29:38 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								d493246f2f
								
							
								
							
						 | 
						
							
							
								
								【灵兽抽卡】  开坑
							
							
							
							
							
						 | 
						
							2020-11-10 11:34:19 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								22038419b7
								
							
								
							
						 | 
						
							
							
								
								神医天降提交
							
							
							
							
							
						 | 
						
							2020-11-06 19:54:00 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								5e130a7585
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0活动开发聚集地/易经宝库' into master_xma_local
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Materials.meta
#	Assets/ManagedResources/EffectResUI/YiJingBaoKu/Materials.meta
#	Assets/ManagedResources/Effects/Model/Materials.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/View/UpView.lua 
							
						 | 
						
							2020-11-06 16:17:12 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e8be02de87
								
							
								
							
						 | 
						
							
							
								
								[移山倒海] 提交
							
							
							
							
							
						 | 
						
							2020-11-06 10:49:08 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								509357e333
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' into 0功能/皮肤
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua 
							
						 | 
						
							2020-11-04 10:54:54 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e92e63444b
								
							
								
							
						 | 
						
							
							
								
								皮肤提交
							
							
							
							
							
						 | 
						
							2020-11-03 17:27:32 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								04ba352791
								
							
								
							
						 | 
						
							
							
								
								【资源】 修改资源路径
							
							
							
							
							
						 | 
						
							2020-11-02 19:54:12 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								8640018b87
								
							
								
							
						 | 
						
							
							
								
								【易经宝库】开坑 搭界面 和做动画
							
							
							
							
							
						 | 
						
							2020-11-02 18:05:24 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								3cdc100777
								
							
								
							
						 | 
						
							
							
								
								【社稷大典/灵兽】特效资源重新整理
							
							
							
							
							
						 | 
						
							2020-11-01 17:00:39 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								23253f96a2
								
							
								
							
						 | 
						
							
							
								
								【社稷大典】名字重复的资源处理
							
							
							
							
							
						 | 
						
							2020-11-01 16:23:08 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								3479bd153c
								
							
								
							
						 | 
						
							
							
								
								【灵兽系统】 合并 功能ok 但是战斗合完进不去
							
							
							
							
							
						 | 
						
							2020-10-31 17:01:46 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								c16a291063
								
							
								
							
						 | 
						
							
							
								
								逍遥特权图标资源
							
							
							
							
							
						 | 
						
							2020-10-30 13:28:10 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								4b88ce6eb3
								
							
								
							
						 | 
						
							
							
								
								【运筹帷幄】限时召唤界面,up将白片
							
							
							
							
							
						 | 
						
							2020-10-30 10:09:04 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								6c1cf4de1a
								
							
								
							
						 | 
						
							
							
								
								【运筹帷幄】1
							
							
							
							
							
						 | 
						
							2020-10-30 10:08:41 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								9add8d8dbf
								
							
								
							
						 | 
						
							
							
								
								【商店】修复ShopView销毁时会导致其他shopview物品回收的问题(修复商店偶现物品消失的问题)
							
							
							
							
							
						 | 
						
							2020-10-27 13:53:32 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								e1a8028ec6
								
							
								
							
						 | 
						
							
							
								
								【资源】部分资源位置修改,防止热更资源过大
							
							
							
							
							
						 | 
						
							2020-10-27 11:03:08 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d8f5a48811
								
							
								
							
						 | 
						
							
							
								
								【累计充值】提示修改
							
							
							
							
							
						 | 
						
							2020-10-26 16:51:47 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								68af385814
								
							
								
							
						 | 
						
							
							
								
								冲突提交
							
							
							
							
							
						 | 
						
							2020-10-29 10:29:14 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								a9634c226f
								
							
								
							
						 | 
						
							
							
								
								yongwangzhiqian commit
							
							
							
							
							
						 | 
						
							2020-10-24 19:12:28 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								a62dc62ead
								
							
								
							
						 | 
						
							
							
								
								【社稷大典】提交
							
							
							
							
							
						 | 
						
							2020-10-24 18:20:43 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								06dcc9f41c
								
							
								
							
						 | 
						
							
							
								
								勇往直前 提交
							
							
							
							
							
						 | 
						
							2020-10-21 14:13:07 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								885de6fe9b
								
							
								
							
						 | 
						
							
							
								
								逍遙游自动游历开启  相关脚本资源提交
							
							
							
							
							
						 | 
						
							2020-10-20 16:17:13 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								19135670ce
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua 
							
						 | 
						
							2020-10-19 20:40:14 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								364c9c99fc
								
							
								
							
						 | 
						
							
							
								
								【逍遥游】功能合并到local分支
							
							
							
							
							
						 | 
						
							2020-10-19 20:37:53 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								bae7d6550e
								
							
								
							
						 | 
						
							
							
								
								竞技场界面修改
							
							
							
							
							
						 | 
						
							2020-10-16 19:36:21 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								0dbf805ef8
								
							
								
							
						 | 
						
							
							
								
								限时召唤 更换主Up神将
							
							
							
							
							
							
							
							(cherry picked from commit 90a5c3f28d) 
							
						 | 
						
							2020-10-23 17:38:45 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								aa9878a1f2
								
							
								
							
						 | 
						
							
							
								
								势不可挡  提交
							
							
							
							
							
						 | 
						
							2020-10-10 16:14:18 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								f2d3f045aa
								
							
								
							
						 | 
						
							
							
								
								森罗幻境提交1
							
							
							
							
							
						 | 
						
							2020-10-12 14:46:05 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								8ff0382e41
								
							
								
							
						 | 
						
							
							
								
								丹心碧血主界面icon 修改提交
							
							
							
							
							
						 | 
						
							2020-10-15 14:06:16 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d249eb412f
								
							
								
							
						 | 
						
							
							
								
								丹心碧血提交
							
							
							
							
							
						 | 
						
							2020-10-15 14:05:56 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								7c38428100
								
							
								
							
						 | 
						
							
							
								
								丹心碧血图片提交
							
							
							
							
							
						 | 
						
							2020-10-15 14:04:45 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								054ea80a3c
								
							
								
							
						 | 
						
							
							
								
								活动icon 提交
							
							
							
							
							
						 | 
						
							2020-09-29 10:30:19 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								783c61eed8
								
							
								
							
						 | 
						
							
							
								
								修复新玩家登陆卡在登陆100%
							
							
							
							
							
						 | 
						
							2020-09-27 20:40:20 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								907d092c04
								
							
								
							
						 | 
						
							
							
								
								遗漏同步提交
							
							
							
							
							
						 | 
						
							2020-09-27 18:27:20 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								c4706208ef
								
							
								
							
						 | 
						
							
							
								
								三界除魔功能添加
							
							
							
							
							
						 | 
						
							2020-09-27 16:43:33 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								bd6fdce461
								
							
								
							
						 | 
						
							
							
								
								遴选  线上活动 :   三周活动 寻宝达人  四周  天宫达人
							
							
							
							
							
						 | 
						
							2020-09-27 16:12:21 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								7b7def3f8f
								
							
								
							
						 | 
						
							
							
								
								勇冠三军,叱咤风云活动添加
							
							
							
							
							
						 | 
						
							2020-09-27 16:09:55 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b97569c645
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-02 17:22:22 +08:00 |