PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								abb7aa4c19
								
							
								
							
						 | 
						
							
							
								
								妖晶替换为钻石
							
							
							
							
							
						 | 
						
							2025-08-13 18:09:55 +08:00 | 
						
					
				
					
						
							
							
								
								 xiejun
							
						 | 
						
							
							
							
							
								
							
								9b27835185
								
							
								
							
						 | 
						
							
							
								
								抽卡
							
							
							
							
							
						 | 
						
							2023-11-03 16:45:33 +08:00 | 
						
					
				
					
						
							
							
								
								 wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								44f6ea0e86
								
							
								
							
						 | 
						
							
							
								
								抽取命石添加次数限制
							
							
							
							
							
						 | 
						
							2023-10-28 15:41:17 +08:00 | 
						
					
				
					
						
							
							
								
								 wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								9c1823a57b
								
							
								
							
						 | 
						
							
							
								
								装备抽卡修改提交
							
							
							
							
							
						 | 
						
							2023-10-27 20:58:24 +08:00 | 
						
					
				
					
						
							
							
								
								 wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								55f0c6d3e6
								
							
								
							
						 | 
						
							
							
								
								魂印图鉴修改 ,命石修改
							
							
							
							
							
						 | 
						
							2023-09-01 18:04:52 +08:00 | 
						
					
				
					
						
							
							
								
								 wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								2b93776f7c
								
							
								
							
						 | 
						
							
							
								
								命格修改提交
							
							
							
							
							
						 | 
						
							2023-09-01 17:36:15 +08:00 | 
						
					
				
					
						
							
							
								
								 wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								0e083205a3
								
							
								
							
						 | 
						
							
							
								
								命格修改提交
							
							
							
							
							
						 | 
						
							2023-09-01 12:34:34 +08:00 | 
						
					
				
					
						
							
							
								
								 wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								18e10b4fb6
								
							
								
							
						 | 
						
							
							
								
								命格修改提交
							
							
							
							
							
						 | 
						
							2023-08-31 19:12:02 +08:00 | 
						
					
				
					
						
							
							
								
								 wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								52393c592c
								
							
								
							
						 | 
						
							
							
								
								命石提交
							
							
							
							
							
						 | 
						
							2023-08-31 15:02:13 +08:00 | 
						
					
				
					
						
							
							
								
								 wangZhenXing
							
						 | 
						
							
							
							
							
								
							
								1bc056f23a
								
							
								
							
						 | 
						
							
							
								
								心愿法宝修改提交
							
							
							
							
							
						 | 
						
							2023-07-03 16:01:29 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								2694f5ad57
								
							
								
							
						 | 
						
							
							
								
								礼包报错修改提交
							
							
							
							
							
						 | 
						
							2023-06-06 17:16:28 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								ebfddaad60
								
							
								
							
						 | 
						
							
							
								
								法宝心愿修改提交
							
							
							
							
							
						 | 
						
							2023-06-06 15:57:53 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								5113dfb137
								
							
								
							
						 | 
						
							
							
								
								元神抽卡添加10连
							
							
							
							
							
						 | 
						
							2022-11-10 10:22:17 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								65a79d27d4
								
							
								
							
						 | 
						
							
							
								
								[gm]=====抽卡消耗显示修改
							
							
							
							
							
						 | 
						
							2022-10-19 18:04:28 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								37de4c4450
								
							
								
							
						 | 
						
							
							
								
								文字显示报错修改
							
							
							
							
							
						 | 
						
							2021-11-27 17:13:28 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e9862a7046
								
							
								
							
						 | 
						
							
							
								
								抽卡提示修改提交
							
							
							
							
							
						 | 
						
							2021-11-27 15:29:46 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								3c67abbd6d
								
							
								
							
						 | 
						
							
							
								
								四元阵闪现人物立绘修改
							
							
							
							
							
						 | 
						
							2021-08-02 11:04:19 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d1bd1a9cb7
								
							
								
							
						 | 
						
							
							
								
								【ID1009397】
							
							
							
							
							
							
							
							四元阵增加置换玉获取提示 
							
						 | 
						
							2021-06-09 10:12:00 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								4dfe018e82
								
							
								
							
						 | 
						
							
							
								
								【ID1009397】
							
							
							
							
							
							
							
							四元阵增加置换玉获取提示 
							
						 | 
						
							2021-06-08 18:19:14 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								7048691167
								
							
								
							
						 | 
						
							
							
								
								【心愿抽卡】十连没音效
							
							
							
							
							
						 | 
						
							2021-06-01 13:42:36 +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
							
						 | 
						
							
							
							
							
								
							
								433bcf9ddb
								
							
								
							
						 | 
						
							
							
								
								【添加音效】
							
							
							
							
							
						 | 
						
							2021-05-18 14:24:09 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								43afe3d6f1
								
							
								
							
						 | 
						
							
							
								
								【内存】btview可能会导致重复卸载资源的问题
							
							
							
							
							
						 | 
						
							2021-04-22 13:40:04 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								30b329a837
								
							
								
							
						 | 
						
							
							
								
								【ios】图片回收
							
							
							
							
							
						 | 
						
							2021-04-21 13:12:04 +08:00 | 
						
					
				
					
						
							
							
								 
								JLIOSM1
							
						 | 
						
							
							
							
							
								
							
								c31a82ef7f
								
							
								
							
						 | 
						
							
							
								
								【ios】lua文件格式修改
							
							
							
							
							
						 | 
						
							2021-04-20 13:58:00 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								071a91773a
								
							
								
							
						 | 
						
							
							
								
								导出 文本提交
							
							
							
							
							
						 | 
						
							2021-04-09 12:26:35 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								0ab7c3177a
								
							
								
							
						 | 
						
							
							
								
								还原文字提交
							
							
							
							
							
						 | 
						
							2021-04-09 12:06:17 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								bfaa5195b5
								
							
								
							
						 | 
						
							
							
								
								Revert "【表删除】报错处理"
							
							
							
							
							
							
							
							This reverts commit b163fc3035. 
							
						 | 
						
							2021-04-07 11:54:39 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								9033d47109
								
							
								
							
						 | 
						
							
							
								
								【本地化】文本导出
							
							
							
							
							
						 | 
						
							2021-04-06 22:33:57 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								b163fc3035
								
							
								
							
						 | 
						
							
							
								
								【表删除】报错处理
							
							
							
							
							
						 | 
						
							2021-04-06 15:16:37 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								68493d2b60
								
							
								
							
						 | 
						
							
							
								
								【本地化】还原文本
							
							
							
							
							
						 | 
						
							2021-04-01 18:45:39 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								838de7cd1c
								
							
								
							
						 | 
						
							
							
								
								文字提交
							
							
							
							
							
						 | 
						
							2021-03-12 14:31:52 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								1cd3d4cdaa
								
							
								
							
						 | 
						
							
							
								
								文字提交
							
							
							
							
							
						 | 
						
							2021-03-12 14:20:14 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d81075da7a
								
							
								
							
						 | 
						
							
							
								
								还原lua
							
							
							
							
							
						 | 
						
							2021-03-02 16:53:12 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								88e59e0c7c
								
							
								
							
						 | 
						
							
							
								
								lua 提交
							
							
							
							
							
						 | 
						
							2021-03-02 15:49:02 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f8bc361605
								
							
								
							
						 | 
						
							
							
								
								【本地化】首充 四元阵
							
							
							
							
							
						 | 
						
							2021-02-24 18:17:46 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e4f4649cf9
								
							
								
							
						 | 
						
							
							
								
								文本提交
							
							
							
							
							
						 | 
						
							2021-02-20 18:01:57 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								602dbc924c
								
							
								
							
						 | 
						
							
							
								
								文本还原
							
							
							
							
							
						 | 
						
							2021-02-20 16:43:44 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								78e7305c15
								
							
								
							
						 | 
						
							
							
								
								【本地化】导出中文
							
							
							
							
							
						 | 
						
							2021-02-05 15:58:37 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								927025f6de
								
							
								
							
						 | 
						
							
							
								
								【本地化】中文字还原,合并用
							
							
							
							
							
						 | 
						
							2021-02-05 12:44:50 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								adf591cbec
								
							
								
							
						 | 
						
							
							
								
								【本地化】lua代码还原
							
							
							
							
							
						 | 
						
							2021-01-27 18:16:54 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								c567dcd426
								
							
								
							
						 | 
						
							
							
								
								【本地化】代码本地化提交
							
							
							
							
							
						 | 
						
							2021-01-26 17:08:39 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								81b3ca1ddc
								
							
								
							
						 | 
						
							
							
								
								【本地化】 中文字还原,合并代码用
							
							
							
							
							
						 | 
						
							2021-01-26 11:13:09 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								3b83a72215
								
							
								
							
						 | 
						
							
							
								
								【本地化】文字还原
							
							
							
							
							
						 | 
						
							2021-01-26 11:05:27 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								f501e92272
								
							
								
							
						 | 
						
							
							
								
								【本地化】代码还原,合并用
							
							
							
							
							
						 | 
						
							2021-01-12 11:00:44 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ae7da93056
								
							
								
							
						 | 
						
							
							
								
								【本地化】还原文字
							
							
							
							
							
						 | 
						
							2021-01-12 10:56:26 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								27b3c1ea32
								
							
								
							
						 | 
						
							
							
								
								【本地化】还原文本到代码中合并用
							
							
							
							
							
						 | 
						
							2021-01-09 14:20:06 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								4d19e7ce98
								
							
								
							
						 | 
						
							
							
								
								中文表导出提交
							
							
							
							
							
						 | 
						
							2020-08-25 15:46:38 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e0359bb37a
								
							
								
							
						 | 
						
							
							
								
								encoding upate
							
							
							
							
							
						 | 
						
							2020-08-06 17:52:32 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								47beef7399
								
							
								
							
						 | 
						
							
							
								
								尝试修改抽卡报错
							
							
							
							
							
						 | 
						
							2020-07-29 15:43:42 +08:00 |