wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								109648ae93
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into china/飞升
							
							
							
							
							
						 | 
						
							2022-01-19 16:13:20 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								ac24c2e0ce
								
							
								
							
						 | 
						
							
							
								
								【ID1010998】
							
							
							
							
							
							
							
							【春节活动】签到领奖活动 
							
						 | 
						
							2022-01-18 14:48:27 +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 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								28df447f1a
								
							
								
							
						 | 
						
							
							
								
								【限时升星】红点刷新不及时
							
							
							
							
							
						 | 
						
							2022-01-10 16:30:01 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ee60ae6c9a
								
							
								
							
						 | 
						
							
							
								
								【限时升星】显示优化,红点添加,条件屏蔽添加
							
							
							
							
							
						 | 
						
							2022-01-10 11:44:39 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c8b604bde4
								
							
								
							
						 | 
						
							
							
								
								【ID1011007】
							
							
							
							
							
							
							
							【优化】功能开启增加新条件类型 
							
						 | 
						
							2022-01-06 11:30:35 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								5b670023ed
								
							
								
							
						 | 
						
							
							
								
								[飞升]=======飞升代码逻辑提交
							
							
							
							
							
						 | 
						
							2022-01-05 18:17:44 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								2a8b4bca8c
								
							
								
							
						 | 
						
							
							
								
								【ID1010994】
							
							
							
							
							
							
							
							增加单笔充值活动 
							
						 | 
						
							2022-01-05 18:17:36 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								a197f16837
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/命格
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/View/ItemView.lua 
							
						 | 
						
							2021-12-17 15:46:53 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								1ae167efb5
								
							
								
							
						 | 
						
							
							
								
								至尊降世修改提交
							
							
							
							
							
						 | 
						
							2021-12-16 16:55:30 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e2a1f147ae
								
							
								
							
						 | 
						
							
							
								
								活动修改提交
							
							
							
							
							
						 | 
						
							2021-12-16 11:42:20 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								11c4f914b5
								
							
								
							
						 | 
						
							
							
								
								至尊降世提交
							
							
							
							
							
						 | 
						
							2021-12-16 11:42:00 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								0c83c3412e
								
							
								
							
						 | 
						
							
							
								
								【ID1010843】
							
							
							
							
							
							
							
							增加英雄回退功能 
							
						 | 
						
							2021-12-14 17:25:44 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								0b9bd476dd
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/命格
							
							
							
							
							
						 | 
						
							2021-12-13 17:26:43 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								bb1e41633a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-12-13 13:46:55 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								53e04ac0d0
								
							
								
							
						 | 
						
							
							
								
								红点修改提交
							
							
							
							
							
						 | 
						
							2021-12-13 13:46:40 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								6e92bbd082
								
							
								
							
						 | 
						
							
							
								
								【红点】主题活动入口显示红点,签到后或领达人活动奖励后,红点消失
							
							
							
							
							
						 | 
						
							2021-12-13 11:04:27 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f09556242d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/命格
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua 
							
						 | 
						
							2021-12-10 14:16:28 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e33181dddb
								
							
								
							
						 | 
						
							
							
								
								招募秘宝提交
							
							
							
							
							
						 | 
						
							2021-12-10 13:41:03 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								e304f2136b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/命格
							
							
							
							
							
						 | 
						
							2021-12-09 20:18:21 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								6f3774c030
								
							
								
							
						 | 
						
							
							
								
								【云梦祈福】不再请求数据
							
							
							
							
							
						 | 
						
							2021-12-09 18:04:29 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								4f1e129473
								
							
								
							
						 | 
						
							
							
								
								【命格】加成预览提交
							
							
							
							
							
						 | 
						
							2021-12-08 17:27:22 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								be16abf79a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/命格
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua 
							
						 | 
						
							2021-12-08 14:18:38 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								9b1ca0135c
								
							
								
							
						 | 
						
							
							
								
								【ID1010829】
							
							
							
							
							
							
							
							增加开服竞技比拼活动——竞技试炼 
							
						 | 
						
							2021-12-08 14:03:23 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								06d532a9bc
								
							
								
							
						 | 
						
							
							
								
								【命格】开坑
							
							
							
							
							
						 | 
						
							2021-12-06 14:06:23 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								7348534847
								
							
								
							
						 | 
						
							
							
								
								【去除多余活动信息】
							
							
							
							
							
						 | 
						
							2021-12-03 16:46:40 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								1253466912
								
							
								
							
						 | 
						
							
							
								
								天地烘炉提交
							
							
							
							
							
						 | 
						
							2021-12-02 15:18:56 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								d39153607b
								
							
								
							
						 | 
						
							
							
								
								【灵兽特惠】倒计时修改
							
							
							
							
							
						 | 
						
							2021-11-29 13:40:53 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								1a40cfba00
								
							
								
							
						 | 
						
							
							
								
								天地烘炉提交
							
							
							
							
							
						 | 
						
							2021-11-26 17:54:35 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								cb331c612e
								
							
								
							
						 | 
						
							
							
								
								【删除活动类那个43】
							
							
							
							
							
						 | 
						
							2021-11-25 16:51:35 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								8da0a81588
								
							
								
							
						 | 
						
							
							
								
								【寻仙抽】提交
							
							
							
							
							
						 | 
						
							2021-11-25 15:59:31 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								86dff44ce7
								
							
								
							
						 | 
						
							
							
								
								【主界面按钮】兼容删除了的活动
							
							
							
							
							
						 | 
						
							2021-11-24 11:43:46 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								a3f8c8aee9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-11-11 16:07:47 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								6e294df15a
								
							
								
							
						 | 
						
							
							
								
								删除log
							
							
							
							
							
						 | 
						
							2021-11-11 16:07:33 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								4ef85b5720
								
							
								
							
						 | 
						
							
							
								
								【【通关奖励】创建新号首次进入通关奖励,通关简单3-10的英雄碎片缺少数量显示,退出该界面在进入数量才显示出来】https://www.tapd.cn/33029060/bugtrace/bugs/view?bug_id=1133029060001019080
							
							
							
							
							
						 | 
						
							2021-11-11 13:49:10 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								ceb7ee3602
								
							
								
							
						 | 
						
							
							
								
								【ID1010636】
							
							
							
							
							
							
							
							【优化】灵兽宝阁活动调整 
							
						 | 
						
							2021-11-10 18:35:38 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								7ac3b1bc14
								
							
								
							
						 | 
						
							
							
								
								【飘渺之旅】修复完成全部任务,无法领取的问题
							
							
							
							
							
						 | 
						
							2021-10-25 19:22:57 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								7ed825b4c1
								
							
								
							
						 | 
						
							
							
								
								飘渺之旅修改提交
							
							
							
							
							
						 | 
						
							2021-10-22 18:06:44 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								2ab4be658d
								
							
								
							
						 | 
						
							
							
								
								【主角修为】图标顺序调整
							
							
							
							
							
						 | 
						
							2021-10-22 09:26:09 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								a6ebd138e4
								
							
								
							
						 | 
						
							
							
								
								【新百宝商会】提交
							
							
							
							
							
						 | 
						
							2021-10-21 17:28:53 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								005468635f
								
							
								
							
						 | 
						
							
							
								
								页签添加红点
							
							
							
							
							
						 | 
						
							2021-10-19 13:25:08 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c091c55bef
								
							
								
							
						 | 
						
							
							
								
								【ID1010437】
							
							
							
							
							
							
							
							【优化】开服玉帝御剑坐骑活动 
							
						 | 
						
							2021-10-19 11:04:06 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								825c38fc0d
								
							
								
							
						 | 
						
							
							
								
								红点修改提交
							
							
							
							
							
							
							
							(cherry picked from commit c546710d1f) 
							
						 | 
						
							2021-07-26 15:19:57 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								38bbb808b4
								
							
								
							
						 | 
						
							
							
								
								【主题活动】商店
							
							
							
							
							
						 | 
						
							2021-07-23 19:05:53 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								92738c45a7
								
							
								
							
						 | 
						
							
							
								
								超值基金红点修改
							
							
							
							
							
						 | 
						
							2021-07-23 13:48:07 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								4af32b0a85
								
							
								
							
						 | 
						
							
							
								
								超值基金红点修改提交
							
							
							
							
							
						 | 
						
							2021-07-23 13:45:40 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								a16d134d2d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-07-22 19:37:13 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								9d7a51fd57
								
							
								
							
						 | 
						
							
							
								
								【容错】登录容错添加,服务器发送不存在的活动时,不再卡死
							
							
							
							
							
						 | 
						
							2021-07-22 19:35:22 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								896bf742c1
								
							
								
							
						 | 
						
							
							
								
								【ID1017463】
							
							
							
							
							
							
							
							【超值基金】在界面刷新后页签和主城入口没红点,重登正常 
							
						 | 
						
							2021-07-21 11:37:04 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								4d8bf852d4
								
							
								
							
						 | 
						
							
							
								
								Revert "bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/19,14:09:40"
							
							
							
							
							
							
							
							This reverts commit 01b3f79c43. 
							
						 | 
						
							2021-07-19 14:10:11 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								01b3f79c43
								
							
								
							
						 | 
						
							
							
								
								bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/19,14:09:40
							
							
							
							
							
						 | 
						
							2021-07-19 14:09:40 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-98AVA47\Administrator
							
						 | 
						
							
							
							
							
								
							
								4d11ade910
								
							
								
							
						 | 
						
							
							
								
								四元阵修改
							
							
							
							
							
						 | 
						
							2021-07-16 14:09:53 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-98AVA47\Administrator
							
						 | 
						
							
							
							
							
								
							
								36f04065fc
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0优化/主题活动
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_1280.png
#	Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_1280.png.meta
#	Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_3280.png
#	Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_3280.png.meta
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua 
							
						 | 
						
							2021-07-15 12:59:20 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								3d7baa815e
								
							
								
							
						 | 
						
							
							
								
								【山河试炼】红点报错修改
							
							
							
							
							
						 | 
						
							2021-07-14 20:00:44 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								a8fd256812
								
							
								
							
						 | 
						
							
							
								
								ID1009412】
							
							
							
							
							
							
							
							【超值基金】超值基金页面及奖励领取逻辑优化
(cherry picked from commit 53e0f1adcc) 
							
						 | 
						
							2021-07-14 16:59:59 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								047c5c26f7
								
							
								
							
						 | 
						
							
							
								
								globaldefine冲突修改
							
							
							
							
							
						 | 
						
							2021-07-14 16:59:03 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								53e0f1adcc
								
							
								
							
						 | 
						
							
							
								
								ID1009412】
							
							
							
							
							
							
							
							【超值基金】超值基金页面及奖励领取逻辑优化 
							
						 | 
						
							2021-07-14 12:04:37 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								9f4d456004
								
							
								
							
						 | 
						
							
							
								
								【ID1009412】
							
							
							
							
							
							
							
							【超值基金】超值基金页面及奖励领取逻辑优化 
							
						 | 
						
							2021-07-13 17:25:21 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								9c2dee5856
								
							
								
							
						 | 
						
							
							
								
								【缥缈之旅】没解锁天数完成了任务,礼包显示灰点
							
							
							
							
							
						 | 
						
							2021-07-07 15:56:29 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								ac7ab00c7e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-07-05 10:58:59 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								a938b217a1
								
							
								
							
						 | 
						
							
							
								
								【缥缈之旅】提交7
							
							
							
							
							
						 | 
						
							2021-07-05 10:58:41 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								48e3b63a08
								
							
								
							
						 | 
						
							
							
								
								【特惠神装】界面逻辑修改
							
							
							
							
							
						 | 
						
							2021-07-05 10:57:47 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								de844aea18
								
							
								
							
						 | 
						
							
							
								
								【缥缈之旅】提交5
							
							
							
							
							
						 | 
						
							2021-07-03 19:23:15 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								6d5d480543
								
							
								
							
						 | 
						
							
							
								
								【缥缈之旅】提交4
							
							
							
							
							
						 | 
						
							2021-07-03 17:46:44 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								fbda34d678
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into china/dev_缥缈之旅
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua 
							
						 | 
						
							2021-07-03 16:53:42 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								6af4522342
								
							
								
							
						 | 
						
							
							
								
								【缥缈之旅】提交3
							
							
							
							
							
						 | 
						
							2021-07-03 16:49:13 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								2f269ebfa8
								
							
								
							
						 | 
						
							
							
								
								【缥缈之旅】提交2
							
							
							
							
							
						 | 
						
							2021-07-03 12:37:56 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								a2528a3ded
								
							
								
							
						 | 
						
							
							
								
								【去掉无用打印】
							
							
							
							
							
						 | 
						
							2021-07-01 21:07:53 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								1be2dc60eb
								
							
								
							
						 | 
						
							
							
								
								【缥缈之旅】提交1
							
							
							
							
							
						 | 
						
							2021-07-01 20:13:47 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								dc4581433e
								
							
								
							
						 | 
						
							
							
								
								【主城】右侧下拉调修复
							
							
							
							
							
						 | 
						
							2021-07-01 14:43:14 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								fe16795d8c
								
							
								
							
						 | 
						
							
							
								
								【主城】右上伸缩条闪烁修改
							
							
							
							
							
						 | 
						
							2021-06-21 16:57:22 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								89facf0425
								
							
								
							
						 | 
						
							
							
								
								添加红点检测
							
							
							
							
							
						 | 
						
							2021-06-18 19:04:44 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e562176180
								
							
								
							
						 | 
						
							
							
								
								超凡入圣提交
							
							
							
							
							
						 | 
						
							2021-06-18 18:24:04 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								10c86e509a
								
							
								
							
						 | 
						
							
							
								
								超凡入圣修改提交
							
							
							
							
							
						 | 
						
							2021-06-18 10:50:04 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								4b708011bc
								
							
								
							
						 | 
						
							
							
								
								【玩家信息】红点问题修复 和log清楚
							
							
							
							
							
						 | 
						
							2021-06-04 16:10:17 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-98AVA47\Administrator
							
						 | 
						
							
							
							
							
								
							
								0ad3913381
								
							
								
							
						 | 
						
							
							
								
								红点修改提交
							
							
							
							
							
						 | 
						
							2021-05-26 18:15:37 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								62f5514f80
								
							
								
							
						 | 
						
							
							
								
								[限时抽卡] 【公会福利红包】bug修改
							
							
							
							
							
						 | 
						
							2021-05-29 16:26:05 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								4af21bc33d
								
							
								
							
						 | 
						
							
							
								
								【幸运探宝】进度条奖励包装显示修改
							
							
							
							
							
						 | 
						
							2021-05-28 15:11:57 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								675ef2efd7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
							
							
							
							
							
							
							
							Conflicts:
	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua 
							
						 | 
						
							2021-05-28 10:47:07 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								21574bebf1
								
							
								
							
						 | 
						
							
							
								
								【限时祈愿】==祈愿活动提交
							
							
							
							
							
						 | 
						
							2021-05-28 10:36:55 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c22e26a5f5
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev-c' into 0优化/无尽副本
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Atlas/FuXingGaoZhao/f_fuxinggaozhao_1888.png.meta
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Logic/GameEvent.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_Onhook.lua 
							
						 | 
						
							2021-05-24 13:53:28 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								7cc12e74a8
								
							
								
							
						 | 
						
							
							
								
								无尽修改提交
							
							
							
							
							
						 | 
						
							2021-05-22 14:08:34 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								1b873eb38d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev-c' into china/ios
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_zida_en.png.meta
#	Assets/ManagedResources/ArtFont_en/n_niuqichongchong_banner_en.png.meta
#	Assets/ManagedResources/ArtFont_en/n_niuqichongchong_niuqizhi_en.png.meta
#	Assets/ManagedResources/ArtFont_en/q_qinlongmibao_banner1_en.png.meta
#	Assets/ManagedResources/ArtFont_en/r_fabao_guiyuan_en.png.meta
#	Assets/ManagedResources/ArtFont_en/sl_en.png.meta
#	Assets/ManagedResources/ArtFont_en/x_xianshizaohuan_wujiangyulan 1_en.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_1_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_2_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_3_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_4_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_6_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_7_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_8_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_9_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_banner_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_niuqizhi_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/q_qinlongmibao_banner1_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/r_fabao_guiyuan_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/sl_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_2_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/w_wj_banner_vi.png.meta
#	Assets/ManagedResources/Atlas/BattleAtlas/r_zhandou_leiquehei_01.png.meta
#	Assets/ManagedResources/Atlas/DyAct_Activity7/timelimit_putishushen2.png.meta
#	Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/t_tongqiangtiebi_banner_zh.jpg.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianshizaohuan_wujiangyulan 1_zh.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/QiKaiDeSheng/q_qikaidesheng_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangLongFuHu/x_xianglongfuhu_shenjiang3.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YiShanDaoHai/y_yishandaohai_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/FirstRechargeAtlas/ArtFont/s_shouchong_100_zh.png.meta
#	Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-congzhi_zh.png.meta
#	Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2.png.meta
#	Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2_gouxuan.png.meta
#	Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_01_zh.png.meta
#	Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_zh.png.meta
#	Assets/ManagedResources/Atlas/TimeLimitSkinAtlas/ArtFont/sl_zh.png.meta
#	Assets/ManagedResources/BG/t_tapolingxiao_beijingtu.png.meta
#	Assets/ManagedResources/DynamicAtlas/b_bianhuanmoce_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/b_bowenduoshi_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/p_pozhengzhuxian_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/q_qikaidesheng_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/s_yongwangzhiqian_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/y_yishandaohai_banner_zh.png
#	Assets/ManagedResources/EffectResUI/Story/Texture/UI_fuzhou_02.png.meta
#	Assets/ManagedResources/EffectResUI/Story/Texture/dianjijiekai.png.meta
#	Assets/ManagedResources/EffectResUI/Story/Texture/star_png.png.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
#	Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Chat/FriendChatPanel.lua
#	Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua
#	Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapView.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
#	Assets/ManagedResources/~Lua/Modules/Login/ServerListItem.lua
#	Assets/ManagedResources/~Lua/Modules/Login/ServerListSelectPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyOnePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Shop/ShopBuyPopup.lua
#	Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
#	Assets/ManagedResources/~Lua/View/PlayerInfoView.lua 
							
						 | 
						
							2021-05-19 14:12:37 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								e763e54799
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev-c' into china_fightLevel
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua 
							
						 | 
						
							2021-05-17 11:04:01 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								1ed38be14a
								
							
								
							
						 | 
						
							
							
								
								【山河社稷图】提交
							
							
							
							
							
						 | 
						
							2021-05-11 20:20:38 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								16e5b894e3
								
							
								
							
						 | 
						
							
							
								
								【天尊降世】增加第三个奖励红点
							
							
							
							
							
						 | 
						
							2021-05-10 10:35:08 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f634ae4e4b
								
							
								
							
						 | 
						
							
							
								
								【竞技场、云游商人】竞技场时间到未弹出,云游增加log
							
							
							
							
							
						 | 
						
							2021-04-29 17:42:35 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								52e6cdd917
								
							
								
							
						 | 
						
							
							
								
								【累计充值红点】主题活动中累计充值的红点会显示在限时活动入口
							
							
							
							
							
						 | 
						
							2021-04-27 23:04:58 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								bd236f0f32
								
							
								
							
						 | 
						
							
							
								
								【踏碎凌霄】
							
							
							
							
							
						 | 
						
							2021-04-23 14:12:24 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								8117c5ebba
								
							
								
							
						 | 
						
							
							
								
								【云游商人】怎加红点
							
							
							
							
							
						 | 
						
							2021-04-22 10:59:32 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								30b329a837
								
							
								
							
						 | 
						
							
							
								
								【ios】图片回收
							
							
							
							
							
						 | 
						
							2021-04-21 13:12:04 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								61833b8b00
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/挂机界面' into china/dev-c
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua 
							
						 | 
						
							2021-04-20 17:51:14 +08:00 | 
						
					
				
					
						
							
							
								 
								JLIOSM1
							
						 | 
						
							
							
							
							
								
							
								c31a82ef7f
								
							
								
							
						 | 
						
							
							
								
								【ios】lua文件格式修改
							
							
							
							
							
						 | 
						
							2021-04-20 13:58:00 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c94f1051da
								
							
								
							
						 | 
						
							
							
								
								挂机修改提交
							
							
							
							
							
						 | 
						
							2021-04-17 21:04:09 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								4de980bf34
								
							
								
							
						 | 
						
							
							
								
								【十五日登陆】不改了
							
							
							
							
							
						 | 
						
							2021-04-12 20:02:56 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								090b0c8f70
								
							
								
							
						 | 
						
							
							
								
								【十五日登录】提交
							
							
							
							
							
						 | 
						
							2021-04-12 19:29:05 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								071a91773a
								
							
								
							
						 | 
						
							
							
								
								导出 文本提交
							
							
							
							
							
						 | 
						
							2021-04-09 12:26:35 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								0ab7c3177a
								
							
								
							
						 | 
						
							
							
								
								还原文字提交
							
							
							
							
							
						 | 
						
							2021-04-09 12:06:17 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								9033d47109
								
							
								
							
						 | 
						
							
							
								
								【本地化】文本导出
							
							
							
							
							
						 | 
						
							2021-04-06 22:33:57 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								cf5a2a46fa
								
							
								
							
						 | 
						
							
							
								
								【本地化】还原文本到代码种
							
							
							
							
							
						 | 
						
							2021-04-06 15:23:27 +08:00 |